OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'erikj/cache_deferreds' of github.com:matrix-org/synapse into erikj/cache_varargs_interface

pull/215/head
Erik Johnston 2015-08-07 19:26:54 +01:00
parent ffab798a38 9c5385b53a
commit 2352974aab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/_base.py
View File

@ -184,7 +184,7 @@ class CacheDescriptor(object):
try:
cached_result_d = self.cache.get(keyargs)
observed = cached_result_d.observe()
observer = cached_result_d.observe()
if DEBUG_CACHES:
@defer.inlineCallbacks
def check_result(cached_result):
@ -197,9 +197,9 @@ class CacheDescriptor(object):
)
raise ValueError("Stale cache entry")
defer.returnValue(cached_result)
observed.addCallback(check_result)
observer.addCallback(check_result)
return observed
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