Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate logging of exceptions in transaction processing (#9780) 

There's no point logging this twice.
This commit is contained in:
Richard van der Hoff 2021-04-09 18:12:15 +01:00 committed by GitHub
parent abc814dcbf
commit f946450184
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/9780.bugfix Normal file
View File

@ -0,0 +1 @@
Fix duplicate logging of exceptions thrown during federation transaction processing.

10
synapse/federation/transport/server.py
View File

@ -425,13 +425,9 @@ class FederationSendServlet(BaseFederationServlet):
logger.exception(e) logger.exception(e)
return 400, {"error": "Invalid transaction"} return 400, {"error": "Invalid transaction"}
try: code, response = await self.handler.on_incoming_transaction(
code, response = await self.handler.on_incoming_transaction( origin, transaction_data
origin, transaction_data )
)
except Exception:
logger.exception("on_incoming_transaction failed")
raise
return code, response return code, response