From 1371d5b798dc308bef8b0adbf3229919981fafa4 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 8 Jan 2019 12:24:48 +0000 Subject: [PATCH 1/2] Don't log stack traces for HTTP error responses --- synapse/federation/transaction_queue.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py index 464051349..fe787abae 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, From 83c50bf7521fe9cb7442b9b51f3e1ae0a855bc89 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Tue, 8 Jan 2019 12:26:16 +0000 Subject: [PATCH 2/2] Newsfile --- changelog.d/4361.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4361.misc diff --git a/changelog.d/4361.misc b/changelog.d/4361.misc new file mode 100644 index 000000000..020dacb54 --- /dev/null +++ b/changelog.d/4361.misc @@ -0,0 +1 @@ +Add better logging for unexpected errors while sending transactions