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

Don't log stack traces for HTTP error responses
matrix-org · Jan 8, 2019 · c4530b9 · c4530b9
2 parents b970cb0 + 83c50bf
commit c4530b9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/changelog.d/4361.misc 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
@@ -522,8 +522,13 @@ def _transaction_transmission_loop(self, destination):
             )
         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,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Add better logging for unexpected errors while sending transactions