summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-19 10:38:48 +0000
committerErik Johnston <erik@matrix.org>2015-02-19 10:38:48 +0000
commit8321e8a2e0381f52f3f434223db58f6ea280d89e (patch)
tree13c5600cbeb56c7c2837dd2df329f10a239f91ac /synapse/notifier.py
parentMerge pull request #73 from matrix-org/hotfixes-v0.7.0f (diff)
parentUpdate release date (diff)
downloadsynapse-8321e8a2e0381f52f3f434223db58f6ea280d89e.tar.xz
Merge branch 'release-v0.7.1' of github.com:matrix-org/synapse
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index e3b6ead620..2475f3ffbe 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -99,6 +99,12 @@ class Notifier(object):
         `extra_users` param.
         """
         yield run_on_reactor()
+
+        # poke any interested application service.
+        self.hs.get_handlers().appservice_handler.notify_interested_services(
+            event
+        )
+
         room_id = event.room_id
 
         room_source = self.event_sources.sources["room"]
@@ -135,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
@@ -203,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