summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 13:02:04 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 13:02:04 +0000
commitc37e7e1774c4c05b709b7725b22d6dd4a1961d95 (patch)
tree53a991ea126fcc7c76ee6160e1ddf531783c06f3 /synapse/notifier.py
parentMerge pull request #73 from matrix-org/hotfixes-v0.7.0f (diff)
parentWe do want to consumeError (diff)
downloadsynapse-c37e7e1774c4c05b709b7725b22d6dd4a1961d95.tar.xz
Merge pull request #76 from matrix-org/consumeErrors
Consume errors
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