Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit f946450

Browse files
authored
Fix duplicate logging of exceptions in transaction processing (#9780)
There's no point logging this twice.
1 parent abc814d commit f946450

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

changelog.d/9780.bugfix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix duplicate logging of exceptions thrown during federation transaction processing.

synapse/federation/transport/server.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -425,13 +425,9 @@ async def on_PUT(self, origin, content, query, transaction_id):
425425
logger.exception(e)
426426
return 400, {"error": "Invalid transaction"}
427427

428-
try:
429-
code, response = await self.handler.on_incoming_transaction(
430-
origin, transaction_data
431-
)
432-
except Exception:
433-
logger.exception("on_incoming_transaction failed")
434-
raise
428+
code, response = await self.handler.on_incoming_transaction(
429+
origin, transaction_data
430+
)
435431

436432
return code, response
437433

0 commit comments

Comments
 (0)