diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-09-28 13:44:47 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-09-28 15:38:09 +0100 |
| commit | e43de3ae4b33fb2fad7a4db042f413ecd7448545 (patch) | |
| tree | 6acf9553496b3e3bfb6928861e4ce9a00528e0c4 | |
| parent | Handle SERVFAILs when doing AAAA lookups for federation (#2477) (diff) | |
| download | synapse-e43de3ae4b33fb2fad7a4db042f413ecd7448545.tar.xz | |
Improve logging of failures in matrixfederationclient
* don't log exception types twice * not all exceptions have a meaningful 'message'. Use the repr rather than attempting to build a string ourselves.
| -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): |