summary refs log tree commit diff
path: root/synapse/notifier.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/notifier.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/notifier.py')
-rw-r--r--synapse/notifier.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py

index e3b6ead620..f5a394596d 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py
@@ -135,7 +135,8 @@ class Notifier(object): with PreserveLoggingContext(): yield defer.DeferredList( - [notify(l).addErrback(eb) for l in listeners] + [notify(l).addErrback(eb) for l in listeners], + consumeErrors=True, ) @defer.inlineCallbacks @@ -203,7 +204,8 @@ class Notifier(object): with PreserveLoggingContext(): yield defer.DeferredList( - [notify(l).addErrback(eb) for l in listeners] + [notify(l).addErrback(eb) for l in listeners], + consumeErrors=True, ) @defer.inlineCallbacks