summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-11 13:23:52 +0100
committerGitHub <noreply@github.com>2019-10-11 13:23:52 +0100
commit6f5c6c8f6093825d227b237592616990cb0816b9 (patch)
treeacf85ef92bcc0cf4bfb61fad5901aab4922c9546 /synapse/http/server.py
parentcas: support setting display name (#6114) (diff)
parentNewsfile (diff)
downloadsynapse-6f5c6c8f6093825d227b237592616990cb0816b9.tar.xz
Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url
Trace non-JSON APIs, /media, /key etc
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):