Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-09-20 19:24:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Correctly handle RequestSendFailed exceptions

Browse source 
This mainly reduces the number of exceptions we log.
This commit is contained in:
Erik Johnston 2019-02-14 13:58:52 +00:00
parent c6e75c9f2d
commit 7fc1196a36
4 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/crypto/keyring.py
View file

@ -35,7 +35,7 @@ from unpaddedbase64 import decode_base64
from twisted.internet import defer
from synapse.api.errors import Codes, SynapseError
from synapse.api.errors import Codes, RequestSendFailed, SynapseError
from synapse.util import logcontext, unwrapFirstError
from synapse.util.logcontext import (
LoggingContext,
@ -656,7 +656,7 @@ def _handle_key_deferred(verify_request):
try:
with PreserveLoggingContext():
_, key_id, verify_key = yield verify_request.deferred
except IOError as e:
except (IOError, RequestSendFailed) as e:
logger.warn(
"Got IOError when downloading keys for %s: %s %s",
server_name, type(e).__name__, str(e),