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/replication | |
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/replication')
-rw-r--r-- | synapse/replication/http/_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/replication/http/_base.py b/synapse/replication/http/_base.py index f5074b101a..2e0594e581 100644 --- a/synapse/replication/http/_base.py +++ b/synapse/replication/http/_base.py @@ -205,7 +205,7 @@ class ReplicationEndpoint(object): args = "/".join("(?P<%s>[^/]+)" % (arg,) for arg in url_args) pattern = re.compile("^/_synapse/replication/%s/%s$" % (self.NAME, args)) - http_server.register_paths(method, [pattern], handler) + http_server.register_paths(method, [pattern], handler, self.__class__.__name__) def _cached_handler(self, request, txn_id, **kwargs): """Called on new incoming requests when caching is enabled. Checks |