diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-17 13:02:04 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-17 13:02:04 +0000 |
| commit | c37e7e1774c4c05b709b7725b22d6dd4a1961d95 (patch) | |
| tree | 53a991ea126fcc7c76ee6160e1ddf531783c06f3 /synapse/federation/federation_server.py | |
| parent | Merge pull request #73 from matrix-org/hotfixes-v0.7.0f (diff) | |
| parent | We do want to consumeError (diff) | |
| download | synapse-c37e7e1774c4c05b709b7725b22d6dd4a1961d95.tar.xz | |
Merge pull request #76 from matrix-org/consumeErrors
Consume errors
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 9f5c98694c..e94d0411b4 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: |