Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Log outbound requests when we retry

Browse Source
This commit is contained in:
Erik Johnston 2018-09-12 16:22:14 +01:00
parent 8fd93b5eea
commit 8c5b84441b
1 changed files with 72 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
synapse/http/matrixfederationclient.py
View File

@ -177,11 +177,6 @@ class MatrixFederationHttpClient(object):
txn_id = "%s-O-%s" % (method, self._next_id) txn_id = "%s-O-%s" % (method, self._next_id)
self._next_id = (self._next_id + 1) % (MAXINT - 1) self._next_id = (self._next_id + 1) % (MAXINT - 1)
outbound_logger.info(
"{%s} [%s] Sending request: %s %s",
txn_id, destination, method, url
)
# XXX: Would be much nicer to retry only at the transaction-layer # XXX: Would be much nicer to retry only at the transaction-layer
# (once we have reliable transactions in place) # (once we have reliable transactions in place)
if long_retries: if long_retries:
@ -194,7 +189,6 @@ class MatrixFederationHttpClient(object):
).decode('ascii') ).decode('ascii')
log_result = None log_result = None
try:
while True: while True:
try: try:
if json_callback: if json_callback:
@ -210,6 +204,11 @@ class MatrixFederationHttpClient(object):
data = None data = None
self.sign_request(destination, method, http_url, headers_dict) self.sign_request(destination, method, http_url, headers_dict)
outbound_logger.info(
"{%s} [%s] Sending request: %s %s",
txn_id, destination, method, url
)
request_deferred = treq.request( request_deferred = treq.request(
method, method,
url, url,