diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-12 13:14:29 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-12 13:14:29 +0100 |
| commit | 95dedb866f04ee4ae034c35130f2a8dc86243fbb (patch) | |
| tree | 80080d23bffdfd8badb1d4b56cb4dc4884a61d4b /synapse/handlers/federation.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_co... (diff) | |
| download | synapse-95dedb866f04ee4ae034c35130f2a8dc86243fbb.tar.xz | |
Unwrap defer.gatherResults failures
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 77c315c47c..cd85001578 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -21,6 +21,7 @@ from synapse.api.errors import ( AuthError, FederationError, StoreError, ) from synapse.api.constants import EventTypes, Membership, RejectedReason +from synapse.util import unwrapFirstError from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logutils import log_function from synapse.util.async import run_on_reactor @@ -926,7 +927,7 @@ class FederationHandler(BaseHandler): if d in have_events and not have_events[d] ], consumeErrors=True - ) + ).addErrback(unwrapFirstError) if different_events: local_view = dict(auth_events) |