diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-09-29 17:32:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 17:32:53 +0100 |
| commit | d5325d7ef1450292e074f0b7431573fdb70a06ba (patch) | |
| tree | 8ae51108e3bfafdc2b742641304370283aa6af36 /synapse | |
| parent | Only log if we've removed media (diff) | |
| parent | Improve logging of failures in matrixfederationclient (diff) | |
| download | synapse-d5325d7ef1450292e074f0b7431573fdb70a06ba.tar.xz | |
Merge pull request #2480 from matrix-org/rav/federation_client_logging
Improve logging of failures in matrixfederationclient
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 747a791f83..6fc3a41c29 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -204,18 +204,15 @@ class MatrixFederationHttpClient(object): raise logger.warn( - "{%s} Sending request failed to %s: %s %s: %s - %s", + "{%s} Sending request failed to %s: %s %s: %s", txn_id, destination, method, url_bytes, - type(e).__name__, _flatten_response_never_received(e), ) - log_result = "%s - %s" % ( - type(e).__name__, _flatten_response_never_received(e), - ) + log_result = _flatten_response_never_received(e) if retries_left and not timeout: if long_retries: @@ -578,12 +575,14 @@ class _JsonProducer(object): def _flatten_response_never_received(e): if hasattr(e, "reasons"): - return ", ".join( + reasons = ", ".join( _flatten_response_never_received(f.value) for f in e.reasons ) + + return "%s:[%s]" % (type(e).__name__, reasons) else: - return "%s: %s" % (type(e).__name__, e.message,) + return repr(e) def check_content_type_is_json(headers): |