summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-17 15:18:17 +0000
committerErik Johnston <erik@matrix.org>2015-02-17 15:18:17 +0000
commitfa6c93bd26d61e06c0030e475fbe9094520c89eb (patch)
treee812ec6a105484f93ebaa6232c2b53654bfe4053 /synapse/notifier.py
parentChange some debug logging to info (diff)
parentWe do want to consumeError (diff)
downloadsynapse-fa6c93bd26d61e06c0030e475fbe9094520c89eb.tar.xz
Merge branch 'consumeErrors' of github.com:matrix-org/synapse into develop
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 c7f75ab801..2475f3ffbe 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -141,7 +141,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
@@ -209,7 +210,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