summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-24 13:11:58 +0100
committerErik Johnston <erik@matrix.org>2015-06-24 13:11:58 +0100
commit307e858b942264ce2aa32c592c0dd0fde098ddcd (patch)
tree3056ea8cb633809c21e56bb75c409eb40f3bf482
parentOnly fail individular deferred for invalid signature (diff)
downloadsynapse-307e858b942264ce2aa32c592c0dd0fde098ddcd.tar.xz
Fix backfill
-rw-r--r--synapse/federation/federation_client.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 47d71542e4..7de7bc89db 100644
--- a/synapse/federation/federation_client.py
+++ b/synapse/federation/federation_client.py
@@ -166,7 +166,10 @@ class FederationClient(FederationBase):
         ]
 
         # FIXME: We should handle signature failures more gracefully.
-        pdus[:] = yield self._check_sigs_and_hashes(pdus)
+        pdus[:] = yield defer.gatherResults(
+            self._check_sigs_and_hashes(pdus),
+            consumeErrors=True,
+        ).addErrback(unwrapFirstError)
 
         defer.returnValue(pdus)