diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2016-04-07 17:26:44 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2016-04-07 17:26:44 +0100 |
| commit | d6e7333ae47feb1c31753dd2eebd09e42907218b (patch) | |
| tree | 250363cd2d3460c01fb2ab1ad3652d5530446f82 /synapse/util/caches/response_cache.py | |
| parent | Merge branch 'develop' into matthew/preview_urls (diff) | |
| parent | Merge pull request #704 from matrix-org/markh/slaveIII (diff) | |
| download | synapse-d6e7333ae47feb1c31753dd2eebd09e42907218b.tar.xz | |
Merge branch 'develop' into matthew/preview_urls
Diffstat (limited to 'synapse/util/caches/response_cache.py')
| -rw-r--r-- | synapse/util/caches/response_cache.py | 2 |
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): |