Merge pull request #564 from matrix-org/erikj/logcontext

Fix up logcontexts

1 files changed, 2 insertions, 3 deletions

diff --git a/synapse/http/server.py b/synapse/http/server.py

index 06935783ca..a90e2e1125 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -99,9 +99,8 @@ def request_handler(request_handler):
             request_context.request = request_id
             with request.processing():
                 try:
-                    d = request_handler(self, request)
-                    with PreserveLoggingContext():
-                        yield d
+                    with PreserveLoggingContext(request_context):
+                        yield request_handler(self, request)
                 except CodeMessageException as e:
                     code = e.code
                     if isinstance(e, SynapseError):