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/rest/admin/server_notice_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/rest/admin/server_notice_servlet.py')
| -rw-r--r-- | synapse/rest/admin/server_notice_servlet.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/synapse/rest/admin/server_notice_servlet.py b/synapse/rest/admin/server_notice_servlet.py index 90c0ee15dc..656526fea5 100644 --- a/synapse/rest/admin/server_notice_servlet.py +++ b/synapse/rest/admin/server_notice_servlet.py @@ -59,9 +59,14 @@ class SendServerNoticeServlet(RestServlet): def register(self, json_resource): PATTERN = "^/_synapse/admin/v1/send_server_notice" - json_resource.register_paths("POST", (re.compile(PATTERN + "$"),), self.on_POST) json_resource.register_paths( - "PUT", (re.compile(PATTERN + "/(?P<txn_id>[^/]*)$"),), self.on_PUT + "POST", (re.compile(PATTERN + "$"),), self.on_POST, self.__class__.__name__ + ) + json_resource.register_paths( + "PUT", + (re.compile(PATTERN + "/(?P<txn_id>[^/]*)$"),), + self.on_PUT, + self.__class__.__name__, ) @defer.inlineCallbacks |