summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-07-24 13:47:51 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2019-07-24 13:47:51 +0100
commitbaf081cd3b040926e2d14dfd1c555307bba59245 (patch)
treeafca8b1c8ad1860b84cf5dbeff16205710e6bf74 /synapse/federation
parentMerge pull request #5743 from matrix-org/erikj/log_origin_receipts_mismatch (diff)
parent1.2.0rc2 (diff)
downloadsynapse-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/federation')
-rw-r--r--synapse/federation/transport/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 663264dec4..ea4e1b6d0f 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -325,7 +325,9 @@ class BaseFederationServlet(object):
             if code is None:
                 continue
 
-            server.register_paths(method, (pattern,), self._wrap(code))
+            server.register_paths(
+                method, (pattern,), self._wrap(code), self.__class__.__name__
+            )
 
 
 class FederationSendServlet(BaseFederationServlet):