summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-07 19:17:58 +0100
committerErik Johnston <erik@matrix.org>2015-08-07 19:17:58 +0100
commit62126c996c5bc8d86d3e15c015a68e8e60622a55 (patch)
tree446494aa3ce353e911101780a5217f2a42814f8d
parentDocs (diff)
downloadsynapse-62126c996c5bc8d86d3e15c015a68e8e60622a55.tar.xz
Propogate stale cache errors to calling functions
-rw-r--r--synapse/storage/_base.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py
index 0872a438f1..524a003153 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -183,8 +183,8 @@ class CacheDescriptor(object):
             try:
                 cached_result_d = cache.get(*keyargs)
 
+                observed = cached_result_d.observe()
                 if DEBUG_CACHES:
-
                     @defer.inlineCallbacks
                     def check_result(cached_result):
                         actual_result = yield self.function_to_call(obj, *args, **kwargs)
@@ -195,9 +195,10 @@ class CacheDescriptor(object):
                                 cached_result, actual_result,
                             )
                             raise ValueError("Stale cache entry")
-                    cached_result_d.observe().addCallback(check_result)
+                        defer.returnValue(cached_result)
+                    observed.addCallback(check_result)
 
-                return cached_result_d.observe()
+                return observed
             except KeyError:
                 # Get the sequence number of the cache before reading from the
                 # database so that we can tell if the cache is invalidated