diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-04-09 18:12:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 18:12:15 +0100 |
| commit | f9464501846755e09e882c97e2d8c1490c9bf74b (patch) | |
| tree | 8f7a78c4bab5cb7d725299ccf61ce7dd57c2633b | |
| parent | Enable complement tests for MSC2946. (#9771) (diff) | |
| download | synapse-f9464501846755e09e882c97e2d8c1490c9bf74b.tar.xz | |
Fix duplicate logging of exceptions in transaction processing (#9780)
There's no point logging this twice.
| -rw-r--r-- | changelog.d/9780.bugfix | 1 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 10 |
2 files changed, 4 insertions, 7 deletions
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 |