OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3909 from turt2live/travis/fix-logging-1 

Fix matrixfederationclient.py logging: Destination is a string
pull/3615/merge
Amber Brown 2018-09-19 18:14:47 +10:00 committed by GitHub
parent 3f0d8e6b09 13b31a9baf
commit 47c02e6332
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1 @@
Fix log format error in matrixfederationclient.py

8
synapse/http/matrixfederationclient.py
View File

@ -150,14 +150,14 @@ def _handle_json_response(reactor, timeout_sec, request, response):
body = yield make_deferred_yieldable(d) body = yield make_deferred_yieldable(d)
except Exception as e: except Exception as e:
logger.warn( logger.warn(
"{%s} [%d] Error reading response: %s", "{%s} [%s] Error reading response: %s",
request.txn_id, request.txn_id,
request.destination, request.destination,
e, e,
) )
raise raise
logger.info( logger.info(
"{%s} [%d] Completed: %d %s", "{%s} [%s] Completed: %d %s",
request.txn_id, request.txn_id,
request.destination, request.destination,
response.code, response.code,
@ -707,14 +707,14 @@ class MatrixFederationHttpClient(object):
length = yield make_deferred_yieldable(d) length = yield make_deferred_yieldable(d)
except Exception as e: except Exception as e:
logger.warn( logger.warn(
"{%s} [%d] Error reading response: %s", "{%s} [%s] Error reading response: %s",
request.txn_id, request.txn_id,
request.destination, request.destination,
e, e,
) )
raise raise
logger.info( logger.info(
"{%s} [%d] Completed: %d %s [%d bytes]", "{%s} [%s] Completed: %d %s [%d bytes]",
request.txn_id, request.txn_id,
request.destination, request.destination,
response.code, response.code,