diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-12 15:23:50 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-12 15:23:50 +0100 |
| commit | a6fb2aa2a5a5837d77bed8813f9e59bfe6be8999 (patch) | |
| tree | 154ff4598b9740104abd5cf465c98cf2797c5406 /synapse/federation/federation_base.py | |
| parent | Merge pull request #149 from matrix-org/erikj/backfill (diff) | |
| parent | Make distributer.fire work as it did (diff) | |
| download | synapse-a6fb2aa2a5a5837d77bed8813f9e59bfe6be8999.tar.xz | |
Merge pull request #144 from matrix-org/erikj/logging_context
Preserving logging contexts
Diffstat (limited to 'synapse/federation/federation_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index 21a763214b..5217d91aab 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -24,6 +24,8 @@ from synapse.crypto.event_signing import check_event_content_hash from synapse.api.errors import SynapseError +from synapse.util import unwrapFirstError + import logging @@ -94,7 +96,7 @@ class FederationBase(object): yield defer.gatherResults( [do(pdu) for pdu in pdus], consumeErrors=True - ) + ).addErrback(unwrapFirstError) defer.returnValue(signed_pdus) |