Preserve log contexts correctly

2018-04-10 12:04:32 +01:00 · 2018-04-10 12:04:32 +01:00 · 1246d23710
parent d49cbf712f
commit 1246d23710
1 changed files with 4 additions and 1 deletions
--- 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
                ))