summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-04-10 12:04:32 +0100
committerErik Johnston <erik@matrix.org>2018-04-10 12:04:32 +0100
commit1246d23710741be866692d47b15c432f48483a52 (patch)
tree6b7c3e04f5a7d3cafdfcaf6b77018e921289cc7b /synapse
parentLog event ID on exception (diff)
downloadsynapse-1246d23710741be866692d47b15c432f48483a52.tar.xz
Preserve log contexts correctly
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/transaction_queue.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 8499d2429e..4dce984c1a 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -226,7 +226,10 @@ class TransactionQueue(object):
                     events_by_room.setdefault(event.room_id, []).append(event)
 
                 yield logcontext.make_deferred_yieldable(defer.gatherResults(
-                    [handle_room_events(evs) for evs in events_by_room.itervalues()],
+                    [
+                        logcontext.preserve_fn(handle_room_events)(evs)
+                        for evs in events_by_room.itervalues()
+                    ],
                     consumeErrors=True
                 ))