diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:14:45 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:14:45 -0400 |
| commit | 0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec (patch) | |
| tree | 9dccb1711608f8c0b3a6dcd22eaa6f100c7a4e17 /synapse/http/servlet.py | |
| parent | use something that's the right type for user_id (diff) | |
| parent | Servers-known-about statistic (#5981) (diff) | |
| download | synapse-0d61d1d7351a8d2e2512dbcaf149e1f19f2271ec.tar.xz | |
Merge branch 'develop' into cross-signing_sig_upload
Diffstat (limited to 'synapse/http/servlet.py')
| -rw-r--r-- | synapse/http/servlet.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index c186b31f59..274c1a6a87 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -20,7 +20,6 @@ import logging from canonicaljson import json from synapse.api.errors import Codes, SynapseError -from synapse.logging.opentracing import trace_servlet logger = logging.getLogger(__name__) @@ -298,10 +297,7 @@ class RestServlet(object): servlet_classname = self.__class__.__name__ method_handler = getattr(self, "on_%s" % (method,)) http_server.register_paths( - method, - patterns, - trace_servlet(servlet_classname)(method_handler), - servlet_classname, + method, patterns, method_handler, servlet_classname ) else: |