diff options
| author | Will Hunt <will@half-shot.uk> | 2018-07-27 12:26:52 +0100 |
|---|---|---|
| committer | Will Hunt <will@half-shot.uk> | 2018-07-27 12:26:52 +0100 |
| commit | 46afacc215db24b128e502c2c23cc3f3205d6f70 (patch) | |
| tree | eb8bd164bcc1b49b507e4d41c900325bcbfc5a5a /synapse/federation/federation_server.py | |
| parent | Auth media/r0/config (diff) | |
| parent | Merge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid (diff) | |
| download | synapse-46afacc215db24b128e502c2c23cc3f3205d6f70.tar.xz | |
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index 48f26db67c..e501251b6e 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -24,6 +24,7 @@ from prometheus_client import Counter from twisted.internet import defer from twisted.internet.abstract import isIPAddress +from twisted.python import failure from synapse.api.constants import EventTypes from synapse.api.errors import AuthError, FederationError, NotFoundError, SynapseError @@ -186,8 +187,12 @@ class FederationServer(FederationBase): logger.warn("Error handling PDU %s: %s", event_id, e) pdu_results[event_id] = {"error": str(e)} except Exception as e: + f = failure.Failure() pdu_results[event_id] = {"error": str(e)} - logger.exception("Failed to handle PDU %s", event_id) + logger.error( + "Failed to handle PDU %s: %s", + event_id, f.getTraceback().rstrip(), + ) yield async.concurrently_execute( process_pdus_for_room, pdus_by_room.keys(), @@ -203,8 +208,8 @@ class FederationServer(FederationBase): ) pdu_failures = getattr(transaction, "pdu_failures", []) - for failure in pdu_failures: - logger.info("Got failure %r", failure) + for fail in pdu_failures: + logger.info("Got failure %r", fail) response = { "pdus": pdu_results, |