summary refs log tree commit diff
path: root/synapse/federation/federation_client.py
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2021-08-23 08:00:25 -0400
committerGitHub <noreply@github.com>2021-08-23 08:00:25 -0400
commit31dac7ffeeb02f68d1dbe068fd241239e02208dc (patch)
tree96089daabe2b92a87ed3aba37758dd6d6abb740e /synapse/federation/federation_client.py
parentRun a nightly CI build against Twisted trunk. (#10651) (diff)
downloadsynapse-31dac7ffeeb02f68d1dbe068fd241239e02208dc.tar.xz
Do not include stack traces for known exceptions when trying multiple federation destinations. (#10662)
Diffstat (limited to '')
-rw-r--r--synapse/federation/federation_client.py7
1 files changed, 6 insertions, 1 deletions
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