summary refs log tree commit diff
path: root/synapse/util/caches
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-04-07 16:35:40 +0100
committerErik Johnston <erik@matrix.org>2016-04-07 16:35:40 +0100
commita294b04bf09bb2292485f7946b6ae8854910dc24 (patch)
tree4639be3f9543b4a9090654f4ecc781d3b4398a6d /synapse/util/caches
parentMerge pull request #703 from matrix-org/erikj/member (diff)
parentRename things (diff)
downloadsynapse-a294b04bf09bb2292485f7946b6ae8854910dc24.tar.xz
Merge pull request #700 from matrix-org/erikj/deduplicate_joins
Deduplicate membership changes
Diffstat (limited to 'synapse/util/caches')
-rw-r--r--synapse/util/caches/response_cache.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/caches/response_cache.py b/synapse/util/caches/response_cache.py
index be310ba320..36686b479e 100644
--- a/synapse/util/caches/response_cache.py
+++ b/synapse/util/caches/response_cache.py
@@ -35,7 +35,7 @@ class ResponseCache(object):
             return None
 
     def set(self, key, deferred):
-        result = ObservableDeferred(deferred)
+        result = ObservableDeferred(deferred, consumeErrors=True)
         self.pending_result_cache[key] = result
 
         def remove(r):