Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-24 22:18:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop

Browse source
This commit is contained in:
Erik Johnston 2015-02-17 15:18:17 +00:00
commit fa6c93bd26
6 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/federation/federation_server.py
View file

@ -124,7 +124,7 @@ class FederationServer(FederationBase):
edu.content
)
results = yield defer.DeferredList(dl)
results = yield defer.DeferredList(dl, consumeErrors=True)
ret = []
for r in results:

2
synapse/federation/transaction_queue.py
View file

@ -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):