diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-07 19:26:38 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-07 19:26:38 +0100 |
| commit | 9c5385b53ad6d8ac21227dbc3f150c7d2511b061 (patch) | |
| tree | 6ce372c14905abecccdfae8cc5045b00d79282b1 /synapse | |
| parent | Propogate stale cache errors to calling functions (diff) | |
| download | synapse-9c5385b53ad6d8ac21227dbc3f150c7d2511b061.tar.xz | |
s/observed/observer/
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/_base.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/_base.py b/synapse/storage/_base.py index 524a003153..5997603b3c 100644 --- a/synapse/storage/_base.py +++ b/synapse/storage/_base.py @@ -183,7 +183,7 @@ class CacheDescriptor(object): try: cached_result_d = cache.get(*keyargs) - observed = cached_result_d.observe() + observer = cached_result_d.observe() if DEBUG_CACHES: @defer.inlineCallbacks def check_result(cached_result): @@ -196,9 +196,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 |