Changeset 306ce5 in indico

Timestamp:

11/09/11 09:11:39 (19 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

8362d6

Parents:

cebb45b

Message:

[IMP] Upcoming Cache error handling

• Ignore/log exceptions when reading from cache storage;
• Regenerate cache;
• Added try..finally to file cache, so that the file always gets unlocked;

Location:

indico

Files:

• MaKaC/common/cache.py (modified) (3 diffs)
• modules/upcoming.py (modified) (1 diff)

indico/MaKaC/common/cache.py

@@ -146 +146 @@
         raise NotImplementedError
 
+
 @CacheStorage.register(True)
 class FileCacheStorage(CacheStorage):
@@ -163 +164 @@
         f = open(filePath, 'wb')
         OSSpecific.lockFile(f, 'LOCK_EX')
-        pickle.dump(data, f)
-        OSSpecific.lockFile(f, 'LOCK_UN')
-        f.close()
+        try:
+            pickle.dump(data, f)
+        finally:
+            OSSpecific.lockFile(f, 'LOCK_UN')
+            f.close()
 
     def load(self, path, name, default=None):
@@ -173 +176 @@
         f = open(filePath, 'rb')
         OSSpecific.lockFile(f, 'LOCK_SH')
-        obj = pickle.load(f)
-        mtime = os.path.getmtime(filePath)
-        OSSpecific.lockFile(f, 'LOCK_UN')
-        f.close()
+        try:
+            obj = pickle.load(f)
+            mtime = os.path.getmtime(filePath)
+        finally:
+            OSSpecific.lockFile(f, 'LOCK_UN')
+            f.close()
         return obj, mtime
 

indico/modules/upcoming.py

@@ -205 +205 @@
     def getUpcomingEventList(self):
 
-        # check if there's a valid cached copy first
-        fromCache = self._cache.loadObject()
+        try:
+            # check if there's a valid cached copy first
+            fromCache = self._cache.loadObject()
+        except:
+            Logger.get('upcoming_events').exception("Upcoming events cache error")
+            fromCache = None
 
         if fromCache: