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

Merge branch 'hawkowl/more-aggressive-no-retry' into hawkowl/federation-limiter

Browse source
This commit is contained in:
Amber H. Brown 2019-07-01 21:37:59 +10:00
parent e6ad608a95 a82457c5a3
commit 11c8e23419
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/http/matrixfederationclient.py
View file

@ -477,7 +477,7 @@ class MatrixFederationHttpClient(object):
raise_from(RequestSendFailed(e, can_retry=True), e)
except Exception as e:
logger.info("Failed to send request: %s", e)
logger.info("Failed to send request for unhandled reason: %s", e)
raise_from(RequestSendFailed(e, can_retry=True), e)
logger.info(
@ -525,9 +525,10 @@ class MatrixFederationHttpClient(object):
break
except RequestSendFailed as e:
logger.warn(
"{%s} [%s] Request failed: %s %s: %s",
"{%s} [%s] Request failed, %s - %s: %s %s: %s",
request.txn_id,
request.destination,
"retrying" if e.can_retry else "not retrying",
request.method,
url_str,
_flatten_response_never_received(e.inner_exception),