diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-08 15:16:16 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-08 15:16:16 +0000 |
| commit | 2bb5f035affda14742ab715033570616621c0000 (patch) | |
| tree | 9348a7051ebb1d264afa47b2ce2d87c8b19f5523 /synapse/http/server.py | |
| parent | Merge pull request #562 from matrix-org/erikj/push_metric (diff) | |
| parent | Fix up logcontexts (diff) | |
| download | synapse-2bb5f035affda14742ab715033570616621c0000.tar.xz | |
Merge pull request #564 from matrix-org/erikj/logcontext
Fix up logcontexts
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 5 |
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): |