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

Fix duplicate logging of exceptions in transaction processing #9780

Merged
merged 1 commit into from
Apr 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/9780.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix duplicate logging of exceptions thrown during federation transaction processing.
10 changes: 3 additions & 7 deletions synapse/federation/transport/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,13 +425,9 @@ async def on_PUT(self, origin, content, query, transaction_id):
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

Expand Down