summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/10662.misc1
-rw-r--r--synapse/federation/federation_client.py7
2 files changed, 7 insertions, 1 deletions
diff --git a/changelog.d/10662.misc b/changelog.d/10662.misc
new file mode 100644

index 0000000000..593f9ceaad --- /dev/null +++ b/changelog.d/10662.misc
@@ -0,0 +1 @@ +Do not print out stack traces for network errors when fetching data over federation. diff --git a/synapse/federation/federation_client.py b/synapse/federation/federation_client.py
index 29979414e3..44d9e8a5c7 100644 --- a/synapse/federation/federation_client.py +++ b/synapse/federation/federation_client.py
@@ -43,6 +43,7 @@ from synapse.api.errors import ( Codes, FederationDeniedError, HttpResponseException, + RequestSendFailed, SynapseError, UnsupportedRoomVersionError, ) @@ -558,7 +559,11 @@ class FederationClient(FederationBase): try: return await callback(destination) - except InvalidResponseError as e: + except ( + RequestSendFailed, + InvalidResponseError, + NotRetryingDestination, + ) as e: logger.warning("Failed to %s via %s: %s", description, destination, e) except UnsupportedRoomVersionError: raise