summary refs log tree commit diff
path: root/synapse/handlers/typing.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/handlers/typing.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/handlers/typing.py')
-rw-r--r--synapse/handlers/typing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/typing.py b/synapse/handlers/typing.py
index c69787005f..c2762f92c7 100644
--- a/synapse/handlers/typing.py
+++ b/synapse/handlers/typing.py
@@ -181,7 +181,7 @@ class TypingNotificationHandler(BaseHandler):
                 },
             ))
 
-        yield defer.DeferredList(deferreds, consumeErrors=False)
+        yield defer.DeferredList(deferreds, consumeErrors=True)
 
     @defer.inlineCallbacks
     def _recv_edu(self, origin, content):