summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-12-03 11:50:23 +0000
committerErik Johnston <erik@matrix.org>2014-12-03 11:50:23 +0000
commitd06dfc70b0c03c5bfa4a4977e406166cef36ee8b (patch)
treed305eed711796d5de5e9d8dcf1f8115f156ef7f4
parentDon't log synapse.storage at DEBUG level when under -v; require -v -v for that (diff)
downloadsynapse-d06dfc70b0c03c5bfa4a4977e406166cef36ee8b.tar.xz
Fix bug where did not always resolve all the deferreds in _attempt_new_transaction
-rw-r--r--synapse/federation/replication.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 312d69fcaa..01f87fe423 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -853,7 +853,10 @@ class _TransactionQueue(object):
 
                 # Ensures we don't continue until all callbacks on that
                 # deferred have fired
-                yield deferred
+                try:
+                    yield deferred
+                except:
+                    pass
 
             logger.debug("TX [%s] Yielded to callbacks", destination)
 
@@ -865,7 +868,8 @@ class _TransactionQueue(object):
             logger.exception(e)
 
             for deferred in deferreds:
-                deferred.errback(e)
+                if not deferred.called:
+                    deferred.errback(e)
 
         finally:
             # We want to be *very* sure we delete this after we stop processing