mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 18:30:24 +00:00
Fix bug where did not always resolve all the deferreds in _attempt_new_transaction
This commit is contained in:
parent
66b0596b7a
commit
d06dfc70b0
1 changed files with 6 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue