Logcontext fixes

Fix some random logcontext leaks.

synapse/handlers/initial_sync.py

@@ -387,19 +387,21 @@ class InitialSyncHandler(BaseHandler):
                 receipts = []
             defer.returnValue(receipts)
 
-        presence, receipts, (messages, token) = yield defer.gatherResults(
+        presence, receipts, (messages, token) = yield make_deferred_yieldable(
-            [
+            defer.gatherResults(
-                run_in_background(get_presence),
+                [
-                run_in_background(get_receipts),
+                    run_in_background(get_presence),
-                run_in_background(
+                    run_in_background(get_receipts),
-                    self.store.get_recent_events_for_room,
+                    run_in_background(
-                    room_id,
+                        self.store.get_recent_events_for_room,
-                    limit=limit,
+                        room_id,
-                    end_token=now_token.room_key,
+                        limit=limit,
-                )
+                        end_token=now_token.room_key,
-            ],
+                    )
-            consumeErrors=True,
+                ],
-        ).addErrback(unwrapFirstError)
+                consumeErrors=True,
+            ).addErrback(unwrapFirstError),
+        )
 
         messages = yield filter_events_for_client(
             self.store, user_id, messages, is_peeking=is_peeking,

synapse/storage/events.py

@@ -39,7 +39,7 @@ from synapse.types import RoomStreamToken, get_domain_from_id
 from synapse.util.async import ObservableDeferred
 from synapse.util.caches.descriptors import cached, cachedInlineCallbacks
 from synapse.util.frozenutils import frozendict_json_encoder
-from synapse.util.logcontext import make_deferred_yieldable
+from synapse.util.logcontext import PreserveLoggingContext, make_deferred_yieldable
 from synapse.util.logutils import log_function
 from synapse.util.metrics import Measure
 
@@ -147,7 +147,8 @@ class _EventPeristenceQueue(object):
                     # callbacks on the deferred.
                     try:
                         ret = yield per_item_callback(item)
-                        item.deferred.callback(ret)
+                        with PreserveLoggingContext():
+                            item.deferred.callback(ret)
                     except Exception:
                         item.deferred.errback()
             finally:

synapse/storage/pusher.py

@@ -233,7 +233,7 @@ class PusherStore(PusherWorkerStore):
             )
 
             if newly_inserted:
-                self.runInteraction(
+                yield self.runInteraction(
                     "add_pusher",
                     self._invalidate_cache_and_stream,
                     self.get_if_user_has_pusher, (user_id,)