diff options
author | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-12-03 11:56:49 +0000 |
commit | 6941a1971548ea8ba37130deeffe2a2e2cd88085 (patch) | |
tree | 9b6947d42c18e4a7ccb9c4e34525faa8e073cf76 /synapse/federation | |
parent | Begin fleshing out a new Event object (diff) | |
parent | Fix bug where did not always resolve all the deferreds in _attempt_new_transa... (diff) | |
download | synapse-6941a1971548ea8ba37130deeffe2a2e2cd88085.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into events_refactor
Diffstat (limited to 'synapse/federation')
-rw-r--r-- | synapse/federation/replication.py | 8 |
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 |