diff options
| author | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-10-02 16:20:41 +0100 |
| commit | 27955056e092b440ed00da13fe6326dd438bb900 (patch) | |
| tree | 8480cf26404b89993e6ffa6cadbabc477be19661 /synapse/http/matrixfederationclient.py | |
| parent | Merge pull request #2472 from matrix-org/erikj/groups_rooms (diff) | |
| parent | Merge pull request #2480 from matrix-org/rav/federation_client_logging (diff) | |
| download | synapse-27955056e092b440ed00da13fe6326dd438bb900.tar.xz | |
Merge branch 'develop' into erikj/groups_merged
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -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 8b94e6f29f..8c8b7fa656 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: @@ -618,12 +615,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): |