diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-12 15:23:50 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-12 15:23:50 +0100 |
| commit | a6fb2aa2a5a5837d77bed8813f9e59bfe6be8999 (patch) | |
| tree | 154ff4598b9740104abd5cf465c98cf2797c5406 /synapse/http/server.py | |
| parent | Merge pull request #149 from matrix-org/erikj/backfill (diff) | |
| parent | Make distributer.fire work as it did (diff) | |
| download | synapse-a6fb2aa2a5a5837d77bed8813f9e59bfe6be8999.tar.xz | |
Merge pull request #144 from matrix-org/erikj/logging_context
Preserving logging contexts
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 93ecbd7589..73efbff4f2 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -17,7 +17,7 @@ from synapse.api.errors import ( cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError ) -from synapse.util.logcontext import LoggingContext +from synapse.util.logcontext import LoggingContext, PreserveLoggingContext import synapse.metrics from syutil.jsonutil import ( @@ -85,7 +85,9 @@ def request_handler(request_handler): "Received request: %s %s", request.method, request.path ) - yield request_handler(self, request) + d = request_handler(self, request) + with PreserveLoggingContext(): + yield d code = request.code except CodeMessageException as e: code = e.code |