Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 22:14:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into notifier_unify

Browse source 
Conflicts:
	synapse/notifier.py
This commit is contained in:
Mark Haines 2015-05-12 15:31:26 +01:00
commit 4429e4bf24
28 changed files with 628 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

23
synapse/notifier.py
View file

@ -16,7 +16,6 @@
from twisted.internet import defer
from synapse.util.logutils import log_function
from synapse.util.logcontext import PreserveLoggingContext
from synapse.util.async import run_on_reactor
from synapse.types import StreamToken
import synapse.metrics
@ -193,12 +192,11 @@ class Notifier(object):
logger.debug("on_new_room_event listeners %s", listeners)
with PreserveLoggingContext():
for listener in listeners:
try:
listener.notify(self)
except:
logger.exception("Failed to notify listener")
for listener in listeners:
try:
listener.notify(self)
except:
logger.exception("Failed to notify listener")
@defer.inlineCallbacks
@log_function
@ -225,12 +223,11 @@ class Notifier(object):
listeners |= room_listeners
with PreserveLoggingContext():
for listener in listeners:
try:
listener.notify(self)
except:
logger.exception("Failed to notify listener")
for listener in listeners:
try:
listener.notify(self)
except:
logger.exception("Failed to notify listener")
@defer.inlineCallbacks
def wait_for_events(self, user, rooms, timeout, callback,