summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-25 10:19:09 +0100
committerErik Johnston <erik@matrix.org>2019-10-25 10:19:09 +0100
commitb409d51dee6cf612a64fedd42798690abca4c11e (patch)
treeb221d42929812cb5229975bf15ec327878006d80 /synapse/http/server.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #6251 from matrix-org/michaelkaye/debug_guard_logging (diff)
downloadsynapse-b409d51dee6cf612a64fedd42798690abca4c11e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/server.py')
-rw-r--r--synapse/http/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py

index cb9158fe1b..2ccb210fd6 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py
@@ -388,7 +388,7 @@ class DirectServeResource(resource.Resource): if not callback: return super().render(request) - resp = callback(request) + resp = trace_servlet(self.__class__.__name__)(callback)(request) # If it's a coroutine, turn it into a Deferred if isinstance(resp, types.CoroutineType):