summary refs log tree commit diff
path: root/synapse/federation/transaction_queue.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 13:02:04 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 13:02:04 +0000
commitc37e7e1774c4c05b709b7725b22d6dd4a1961d95 (patch)
tree53a991ea126fcc7c76ee6160e1ddf531783c06f3 /synapse/federation/transaction_queue.py
parentMerge pull request #73 from matrix-org/hotfixes-v0.7.0f (diff)
parentWe do want to consumeError (diff)
downloadsynapse-c37e7e1774c4c05b709b7725b22d6dd4a1961d95.tar.xz
Merge pull request #76 from matrix-org/consumeErrors
Consume errors
Diffstat (limited to 'synapse/federation/transaction_queue.py')
-rw-r--r--synapse/federation/transaction_queue.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 731019ad9f..bb20f2ebab 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -98,7 +98,7 @@ class TransactionQueue(object):
 
             deferreds.append(deferred)
 
-        yield defer.DeferredList(deferreds)
+        yield defer.DeferredList(deferreds, consumeErrors=True)
 
     # NO inlineCallbacks
     def enqueue_edu(self, edu):