diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-27 11:47:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 11:47:21 +0100 |
| commit | 53494c34df323db5e5319f5594d64ff1d9c2bb33 (patch) | |
| tree | f229d34ab66d4bb9275db27fd7ab92a8cc71a22b /synapse/handlers/e2e_keys.py | |
| parent | Merge tag 'v0.28.0' (diff) | |
| parent | Add missing consumeErrors (diff) | |
| download | synapse-53494c34df323db5e5319f5594d64ff1d9c2bb33.tar.xz | |
Merge pull request #3139 from matrix-org/rav/consume_errors
Add missing consumeErrors to improve exception handling
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", |