Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not include stack traces for known exceptions when trying multiple federation destinations. (#10662)

This commit is contained in:
Patrick Cloke 2021-08-23 08:00:25 -04:00 committed by GitHub
parent 4db65f911a
commit 31dac7ffee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/10662.misc Normal file
View File

@ -0,0 +1 @@
Do not print out stack traces for network errors when fetching data over federation.

7
synapse/federation/federation_client.py
View File

@ -43,6 +43,7 @@ from synapse.api.errors import (
Codes, Codes,
FederationDeniedError, FederationDeniedError,
HttpResponseException, HttpResponseException,
RequestSendFailed,
SynapseError, SynapseError,
UnsupportedRoomVersionError, UnsupportedRoomVersionError,
) )
@ -558,7 +559,11 @@ class FederationClient(FederationBase):
try: try:
return await callback(destination) 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) logger.warning("Failed to %s via %s: %s", description, destination, e)
except UnsupportedRoomVersionError: except UnsupportedRoomVersionError:
raise raise