summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-08-28 16:19:16 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-08-28 16:19:16 +0100
commitb1da3fa0a78ab7c6af8c274b6c2beafb7a5a751a (patch)
tree323a2117e271b994dcacccc35ccabc6001f61e67
parentRe-enable presence, un-skip presence tests (diff)
downloadsynapse-b1da3fa0a78ab7c6af8c274b6c2beafb7a5a751a.tar.xz
Avoid AlreadyCalledError from EDU sending failures
Diffstat (limited to '')
-rw-r--r--synapse/federation/replication.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 38ae360bcd..7868575a2e 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -541,7 +541,8 @@ class _TransactionQueue(object):
         )
 
         def eb(failure):
-            deferred.errback(failure)
+            if not deferred.called:
+                deferred.errback(failure)
         self._attempt_new_transaction(destination).addErrback(eb)
 
         return deferred