summary refs log tree commit diff
path: root/synapse/federation/federation_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 10:03:23 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 10:07:01 +0000
commit72a4de2ce627528a13bda480403344ffde6275d3 (patch)
tree0c295e05052a5f50be0f1447fe4f284b8c8e335d /synapse/federation/federation_server.py
parentMerge pull request #73 from matrix-org/hotfixes-v0.7.0f (diff)
downloadsynapse-72a4de2ce627528a13bda480403344ffde6275d3.tar.xz
Use consumeErrors=True on all DeferredLists.
This is so that the DeferredLists actually consume the error instead of
propogating down the non-existent errback chain. This should reduce the
number of unhandled errors we are seeing.
Diffstat (limited to 'synapse/federation/federation_server.py')
-rw-r--r--synapse/federation/federation_server.py2
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: