summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-15 11:54:51 +0100
committerErik Johnston <erik@matrix.org>2015-05-15 11:54:51 +0100
commite275a9c0d9365f77cb06f2a04c55f591ac5b54c7 (patch)
tree61ce90291bd0817da8d915b5ab9320908d186c01 /synapse/storage
parentAdd a wait (diff)
downloadsynapse-e275a9c0d9365f77cb06f2a04c55f591ac5b54c7.tar.xz
preserve log context
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/events.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index f694b877f4..c621516039 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -21,6 +21,7 @@ from synapse.events import FrozenEvent
 from synapse.events.utils import prune_event
 from synapse.util import unwrap_deferred
 
+from synapse.util.logcontext import preserve_context_over_deferred
 from synapse.util.logutils import log_function
 from synapse.api.constants import EventTypes
 from synapse.crypto.event_signing import compute_event_reference_hash
@@ -587,7 +588,7 @@ class EventsStore(SQLBaseStore):
             )
 
         logger.debug("events_d before")
-        rows = yield events_d
+        rows = yield preserve_context_over_deferred(events_d)
         logger.debug("events_d after")
 
         res = yield defer.gatherResults(