From cb3dfb3875efa41a0ed368efbbabeceb0e39bd37 Mon Sep 17 00:00:00 2001 From: Ryan Matsumoto Date: Thu, 5 Jan 2017 18:44:59 -0800 Subject: [PATCH 1/3] Updated memcache error checking to handle large object exception --- appengine/standard/memcache/guestbook/app.yaml | 1 - appengine/standard/memcache/guestbook/main.py | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/appengine/standard/memcache/guestbook/app.yaml b/appengine/standard/memcache/guestbook/app.yaml index 5227472ff0c..1676c4ac14c 100644 --- a/appengine/standard/memcache/guestbook/app.yaml +++ b/appengine/standard/memcache/guestbook/app.yaml @@ -3,7 +3,6 @@ # https://developers.google.com/appengine/docs/python/config/appconfig # for details. -version: 1 runtime: python27 api_version: 1 threadsafe: yes diff --git a/appengine/standard/memcache/guestbook/main.py b/appengine/standard/memcache/guestbook/main.py index fbe850e4925..09e712d6bb6 100644 --- a/appengine/standard/memcache/guestbook/main.py +++ b/appengine/standard/memcache/guestbook/main.py @@ -85,8 +85,11 @@ def get_greetings(self, guestbook_name): greetings = memcache.get('{}:greetings'.format(guestbook_name)) if greetings is None: greetings = self.render_greetings(guestbook_name) - if not memcache.add('{}:greetings'.format(guestbook_name), - greetings, 10): + try: + if not memcache.add('{}:greetings'.format(guestbook_name), + greetings, 10): + logging.error('Memcache set failed.') + except: logging.error('Memcache set failed.') return greetings # [END check_memcache] From bd468c3d97abc0c144458f76818ba860c65d0dad Mon Sep 17 00:00:00 2001 From: Ryan Matsumoto Date: Thu, 5 Jan 2017 19:31:12 -0800 Subject: [PATCH 2/3] Modified memcache error handling messages some more --- appengine/standard/memcache/guestbook/main.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/appengine/standard/memcache/guestbook/main.py b/appengine/standard/memcache/guestbook/main.py index 09e712d6bb6..2c8f6191591 100644 --- a/appengine/standard/memcache/guestbook/main.py +++ b/appengine/standard/memcache/guestbook/main.py @@ -86,11 +86,14 @@ def get_greetings(self, guestbook_name): if greetings is None: greetings = self.render_greetings(guestbook_name) try: - if not memcache.add('{}:greetings'.format(guestbook_name), - greetings, 10): + added = memcache.add('{}:greetings'.format(guestbook_name), + greetings, 10) + if not added: logging.error('Memcache set failed.') - except: - logging.error('Memcache set failed.') + except ValueError: + logging.error('Memcache set failed - data larger than 1MB') + except Exception as e: + logging.error('Memcache set failed - {}'.format(e)) return greetings # [END check_memcache] From 97d1434c93e567a23a2fc027845f36f38d6dc936 Mon Sep 17 00:00:00 2001 From: Ryan Matsumoto Date: Fri, 6 Jan 2017 11:36:16 -0800 Subject: [PATCH 3/3] Fixed style issues --- appengine/standard/memcache/guestbook/main.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/appengine/standard/memcache/guestbook/main.py b/appengine/standard/memcache/guestbook/main.py index 2c8f6191591..ad087b2ac72 100644 --- a/appengine/standard/memcache/guestbook/main.py +++ b/appengine/standard/memcache/guestbook/main.py @@ -86,14 +86,12 @@ def get_greetings(self, guestbook_name): if greetings is None: greetings = self.render_greetings(guestbook_name) try: - added = memcache.add('{}:greetings'.format(guestbook_name), - greetings, 10) + added = memcache.add( + '{}:greetings'.format(guestbook_name), greetings, 10) if not added: logging.error('Memcache set failed.') except ValueError: logging.error('Memcache set failed - data larger than 1MB') - except Exception as e: - logging.error('Memcache set failed - {}'.format(e)) return greetings # [END check_memcache]