summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-04-03 15:42:38 +0100
committerRichard van der Hoff <richard@matrix.org>2017-04-03 15:42:38 +0100
commit65e1683680b656accd46f531e00d69b68a09c49e (patch)
treedd62164064c69d9a486c5818629952cabfc356a6 /synapse
parentpreserve_fn some deferred-returning things (diff)
downloadsynapse-65e1683680b656accd46f531e00d69b68a09c49e.tar.xz
Remove spurious PreserveLoggingContext
In `on_new_room_event`, remove `PreserveLoggingContext` - we can call its
subroutines with the logcontext set.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/notifier.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index e8177452a8..57d6a8cfe3 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -215,13 +215,12 @@ class Notifier(object):
         until all previous events have been persisted before notifying
         the client streams.
         """
-        with PreserveLoggingContext():
-            self.pending_new_room_events.append((
-                room_stream_id, event, extra_users
-            ))
-            self._notify_pending_new_room_events(max_room_stream_id)
+        self.pending_new_room_events.append((
+            room_stream_id, event, extra_users
+        ))
+        self._notify_pending_new_room_events(max_room_stream_id)
 
-            self.notify_replication()
+        self.notify_replication()
 
     def _notify_pending_new_room_events(self, max_room_stream_id):
         """Notify for the room events that were queued waiting for a previous