diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-05-12 16:37:50 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-05-12 16:37:50 +0100 |
| commit | cffe6057fb59a4db622132a84b5ef88cf81f6bfd (patch) | |
| tree | 173ebcd9a8c7c04ee3a4f733995a47c515e9c81a /synapse/http/server.py | |
| parent | Merge branch 'notifier_unify' into notifier_performance (diff) | |
| parent | Merge branch 'develop' into notifier_unify (diff) | |
| download | synapse-cffe6057fb59a4db622132a84b5ef88cf81f6bfd.tar.xz | |
Merge branch 'notifier_unify' into notifier_performance
Conflicts: synapse/notifier.py
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 |