summary refs log tree commit diff
path: root/synapse/federation/federation_base.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-12 13:14:29 +0100
committerErik Johnston <erik@matrix.org>2015-05-12 13:14:29 +0100
commit95dedb866f04ee4ae034c35130f2a8dc86243fbb (patch)
tree80080d23bffdfd8badb1d4b56cb4dc4884a61d4b /synapse/federation/federation_base.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_co... (diff)
downloadsynapse-95dedb866f04ee4ae034c35130f2a8dc86243fbb.tar.xz
Unwrap defer.gatherResults failures
Diffstat (limited to 'synapse/federation/federation_base.py')
-rw-r--r--synapse/federation/federation_base.py4
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)