Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Erik Johnston 2015-08-07 19:26:54 +01:00
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: try:
cached_result_d = self.cache.get(keyargs) cached_result_d = self.cache.get(keyargs)
observed = cached_result_d.observe() observer = cached_result_d.observe()
if DEBUG_CACHES: if DEBUG_CACHES:
@defer.inlineCallbacks @defer.inlineCallbacks
def check_result(cached_result): def check_result(cached_result):
@ -197,9 +197,9 @@ class CacheDescriptor(object):
) )
raise ValueError("Stale cache entry") raise ValueError("Stale cache entry")
defer.returnValue(cached_result) defer.returnValue(cached_result)
observed.addCallback(check_result) observer.addCallback(check_result)
return observed return observer
except KeyError: except KeyError:
# Get the sequence number of the cache before reading from the # Get the sequence number of the cache before reading from the
# database so that we can tell if the cache is invalidated # database so that we can tell if the cache is invalidated