From d959d28730ec6a0765ab72b10bcc96b1507233ac Mon Sep 17 00:00:00 2001 From: Patrick Cloke Date: Tue, 6 Apr 2021 07:21:57 -0400 Subject: Add type hints to the federation handler and server. (#9743) --- synapse/federation/transport/server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'synapse/federation/transport/server.py') diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 84e39c5a46..5ef0556ef7 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -620,8 +620,8 @@ class FederationThirdPartyInviteExchangeServlet(BaseFederationServlet): PATH = "/exchange_third_party_invite/(?P[^/]*)" async def on_PUT(self, origin, content, query, room_id): - content = await self.handler.on_exchange_third_party_invite_request(content) - return 200, content + await self.handler.on_exchange_third_party_invite_request(content) + return 200, {} class FederationClientKeysQueryServlet(BaseFederationServlet): -- cgit 1.5.1 From f9464501846755e09e882c97e2d8c1490c9bf74b Mon Sep 17 00:00:00 2001 From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Date: Fri, 9 Apr 2021 18:12:15 +0100 Subject: Fix duplicate logging of exceptions in transaction processing (#9780) There's no point logging this twice. --- changelog.d/9780.bugfix | 1 + synapse/federation/transport/server.py | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 changelog.d/9780.bugfix (limited to 'synapse/federation/transport/server.py') diff --git a/changelog.d/9780.bugfix b/changelog.d/9780.bugfix new file mode 100644 index 0000000000..70985a050f --- /dev/null +++ b/changelog.d/9780.bugfix @@ -0,0 +1 @@ +Fix duplicate logging of exceptions thrown during federation transaction processing. diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 5ef0556ef7..a9c1391d27 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -425,13 +425,9 @@ class FederationSendServlet(BaseFederationServlet): logger.exception(e) return 400, {"error": "Invalid transaction"} - try: - code, response = await self.handler.on_incoming_transaction( - origin, transaction_data - ) - except Exception: - logger.exception("on_incoming_transaction failed") - raise + code, response = await self.handler.on_incoming_transaction( + origin, transaction_data + ) return code, response -- cgit 1.5.1