Merge pull request #4361 from matrix-org/erikj/better_errors

Don't log stack traces for HTTP error responses

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,