diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 15:18:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 15:18:17 +0000 |
| commit | fa6c93bd26d61e06c0030e475fbe9094520c89eb (patch) | |
| tree | e812ec6a105484f93ebaa6232c2b53654bfe4053 /synapse/federation | |
| parent | Change some debug logging to info (diff) | |
| parent | We do want to consumeError (diff) | |
| download | synapse-fa6c93bd26d61e06c0030e475fbe9094520c89eb.tar.xz | |
Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 2 | ||||
| -rw-r--r-- | synapse/federation/transaction_queue.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 4391a60c02..078ad0626d 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -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: diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 731019ad9f..bb20f2ebab 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -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): |