diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-12 15:31:26 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-12 15:31:26 +0100 |
| commit | 4429e4bf2499b0b3fecc8637c2a7a932aab908e4 (patch) | |
| tree | 0c17e1767434df9684c3d34263a161ba4fa1d9b9 /synapse/notifier.py | |
| parent | Update the end_token correctly, otherwise the token doesn't advance and the c... (diff) | |
| parent | Merge pull request #143 from matrix-org/erikj/SYN-375 (diff) | |
| download | synapse-4429e4bf2499b0b3fecc8637c2a7a932aab908e4.tar.xz | |
Merge branch 'develop' into notifier_unify
Conflicts: synapse/notifier.py
Diffstat (limited to 'synapse/notifier.py')
| -rw-r--r-- | synapse/notifier.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py index ef7d15671f..4ebe1d66de 100644 --- a/synapse/notifier.py +++ b/synapse/notifier.py @@ -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, |