summary refs log tree commit diff
path: root/synapse/storage/_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-07 19:28:39 +0100
committerErik Johnston <erik@matrix.org>2015-08-07 19:28:39 +0100
commit7dec0b2beeca1d1b7d298dc814fcfc5aff52340c (patch)
tree1579a8cec0170025627645ced547704cf2410605 /synapse/storage/_base.py
parentBatch up various DB requests for event -> state (diff)
parentMerge pull request #212 from matrix-org/erikj/cache_deferreds (diff)
downloadsynapse-7dec0b2beeca1d1b7d298dc814fcfc5aff52340c.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/storage/_base.py')
-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 556aa3b523..a49dbb2ef5 100644
--- a/synapse/storage/_base.py
+++ b/synapse/storage/_base.py
@@ -186,8 +186,8 @@ class CacheDescriptor(object):
             try:
                 cached_result_d = self.cache.get(keyargs)
 
+                observer = cached_result_d.observe()
                 if DEBUG_CACHES:
-
                     @defer.inlineCallbacks
                     def check_result(cached_result):
                         actual_result = yield self.function_to_call(obj, *args, **kwargs)
@@ -198,9 +198,10 @@ class CacheDescriptor(object):
                                 cached_result, actual_result,
                             )
                             raise ValueError("Stale cache entry")
-                    cached_result_d.observe().addCallback(check_result)
+                        defer.returnValue(cached_result)
+                    observer.addCallback(check_result)
 
-                return cached_result_d.observe()
+                return observer
             except KeyError:
                 # Get the sequence number of the cache before reading from the
                 # database so that we can tell if the cache is invalidated