diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-27 11:16:28 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-27 11:16:28 +0100 |
| commit | 605defb9e4c274d61d9da86546e6fd6c78f3f6cf (patch) | |
| tree | b053758cb06ca6acd36b63cc22f2c020616f3151 /synapse/handlers/e2e_keys.py | |
| parent | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff) | |
| download | synapse-605defb9e4c274d61d9da86546e6fd6c78f3f6cf.tar.xz | |
Add missing consumeErrors
In general we want defer.gatherResults to consumeErrors, rather than having exceptions hanging around and getting logged as CRITICAL unhandled errors.
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
| -rw-r--r-- | synapse/handlers/e2e_keys.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/e2e_keys.py b/synapse/handlers/e2e_keys.py index 325c0c4a9f..7eb03ad32e 100644 --- a/synapse/handlers/e2e_keys.py +++ b/synapse/handlers/e2e_keys.py @@ -141,7 +141,7 @@ class E2eKeysHandler(object): yield make_deferred_yieldable(defer.gatherResults([ preserve_fn(do_remote_query)(destination) for destination in remote_queries_not_in_cache - ])) + ], consumeErrors=True)) defer.returnValue({ "device_keys": results, "failures": failures, @@ -244,7 +244,7 @@ class E2eKeysHandler(object): yield make_deferred_yieldable(defer.gatherResults([ preserve_fn(claim_client_keys)(destination) for destination in remote_queries - ])) + ], consumeErrors=True)) logger.info( "Claimed one-time-keys: %s", |