maxmustermann/synapse
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cancel in connect

Browse source
This commit is contained in:
Amber H. Brown 2019-07-01 22:07:19 +10:00
parent 30ed28417e
commit 45c0117abf
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/http/matrixfederationclient.py
View file

@ -36,6 +36,7 @@ from twisted.internet.error import (
ConnectionRefusedError,
DNSLookupError,
TimeoutError,
ConnectingCancelledError,
)
from twisted.internet.interfaces import IReactorPluggableNameResolver
from twisted.internet.task import _EPSILON, Cooperator
@ -444,7 +445,7 @@ class MatrixFederationHttpClient(object):
logger.info("Failed to send request: %s", e)
raise_from(RequestSendFailed(e, can_retry=True), e)
except TimeoutError as e:
except (TimeoutError, ConnectingCancelledError) as e:
# Handle timeouts
if self.backoff_settings.on_timeout:
raise_from(RequestSendFailed(e, can_retry=False), e)