summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-26 12:37:06 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-26 12:37:06 +0000
commit1b032df99ff89f9b068d8771d7f9861cd0326c30 (patch)
tree64485e9215ce0b721209b43ea136515234daf4cd /synapse/http
parentcas: support setting display name (#6114) (diff)
parentMerge pull request #6195 from matrix-org/erikj/opentracing_preview_url (diff)
downloadsynapse-1b032df99ff89f9b068d8771d7f9861cd0326c30.tar.xz
Merge pull request #6195 from matrix-org/erikj/opentracing_preview_url
Diffstat (limited to 'synapse/http')
-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):