diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-24 13:47:51 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-07-24 13:47:51 +0100 |
| commit | baf081cd3b040926e2d14dfd1c555307bba59245 (patch) | |
| tree | afca8b1c8ad1860b84cf5dbeff16205710e6bf74 /synapse/http/servlet.py | |
| parent | Merge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch (diff) | |
| parent | 1.2.0rc2 (diff) | |
| download | synapse-baf081cd3b040926e2d14dfd1c555307bba59245.tar.xz | |
Merge tag 'v1.2.0rc2' into develop
Bugfixes -------- - Fix a regression introduced in v1.2.0rc1 which led to incorrect labels on some prometheus metrics. ([\#5734](https://github.com/matrix-org/synapse/issues/5734))
Diffstat (limited to 'synapse/http/servlet.py')
| -rw-r--r-- | synapse/http/servlet.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index 889038ff25..f0ca7d9aba 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -290,11 +290,13 @@ class RestServlet(object): for method in ("GET", "PUT", "POST", "OPTIONS", "DELETE"): if hasattr(self, "on_%s" % (method,)): + servlet_classname = self.__class__.__name__ method_handler = getattr(self, "on_%s" % (method,)) http_server.register_paths( method, patterns, - trace_servlet(self.__class__.__name__, method_handler), + trace_servlet(servlet_classname, method_handler), + servlet_classname, ) else: |