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

Commit

Permalink
Fix duplicate logging of exceptions in transaction processing (#9780)
Browse files Browse the repository at this point in the history
There's no point logging this twice.
  • Loading branch information
richvdh authored Apr 9, 2021
1 parent abc814d commit f946450
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
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

0 comments on commit f946450

Please sign in to comment.