diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-10-18 10:11:40 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-10-18 10:11:40 +0100 |
| commit | 80003dfcd503a72cb4da515b17c3765faccc2ce6 (patch) | |
| tree | 448fc279a9278566283721bb6a0c86f17efdbd36 /synapse/http | |
| parent | changelog (diff) | |
| parent | Remove dead changelog file (diff) | |
| download | synapse-80003dfcd503a72cb4da515b17c3765faccc2ce6.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/event_auth/1
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/server.py | 2 |
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): |