diff options
| author | Erik Johnston <erikj@jki.re> | 2019-01-08 14:19:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-08 14:19:00 +0000 |
| commit | c4530b97b2bc52832a1246a931d397bf2eea874a (patch) | |
| tree | 889f9f953c0d0f0f42d6e2f3c0bb806bd9e4104f | |
| parent | Refactor request sending to have better excpetions (#4358) (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-c4530b97b2bc52832a1246a931d397bf2eea874a.tar.xz | |
Merge pull request #4361 from matrix-org/erikj/better_errors
Don't log stack traces for HTTP error responses
| -rw-r--r-- | changelog.d/4361.misc | 1 | ||||
| -rw-r--r-- | synapse/federation/transaction_queue.py | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changelog.d/4361.misc b/changelog.d/4361.misc new file mode 100644 index 0000000000..020dacb547 --- /dev/null +++ b/changelog.d/4361.misc @@ -0,0 +1 @@ +Add better logging for unexpected errors while sending transactions diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 4640513497..fe787abaeb 100644 --- a/synapse/federation/transaction_queue.py +++ b/synapse/federation/transaction_queue.py @@ -522,8 +522,13 @@ class TransactionQueue(object): ) except FederationDeniedError as e: logger.info(e) + except HttpResponseException as e: + logger.warning( + "TX [%s] Received %d response to transaction: %s", + destination, e.code, e, + ) except RequestSendFailed as e: - logger.warning("(TX [%s] Failed to send transaction: %s", destination, e) + logger.warning("TX [%s] Failed to send transaction: %s", destination, e) for p, _ in pending_pdus: logger.info("Failed to send event %s to %s", p.event_id, |