summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-07 19:18:47 +0100
committerErik Johnston <erik@matrix.org>2015-08-07 19:18:47 +0100
commitffab798a38830cee24bd84aa80192dd5b9b9a818 (patch)
tree85245830c720466f0f069f768848ffab72f2e044 /synapse
parentRemove unnecessary cache (diff)
parentPropogate stale cache errors to calling functions (diff)
downloadsynapse-ffab798a38830cee24bd84aa80192dd5b9b9a818.tar.xz
Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface
Diffstat (limited to '')
-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 e07cf3b58a..e1f29a3aca 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -184,8 +184,8 @@ class CacheDescriptor(object):
             try:
                 cached_result_d = self.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)
@@ -196,9 +196,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