diff options
| author | Erik Johnston <erikj@jki.re> | 2018-09-14 16:58:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-14 16:58:44 +0100 |
| commit | 3e6e94fe9f2f543de923f33ada5cb19f93428ded (patch) | |
| tree | cab11a3071e6ff10dab205a7f0dd276d60ba5736 /synapse/http/client.py | |
| parent | Merge pull request #3871 from matrix-org/erikj/in_flight_block_metrics (diff) | |
| parent | fix (diff) | |
| download | synapse-3e6e94fe9f2f543de923f33ada5cb19f93428ded.tar.xz | |
Merge pull request #3872 from matrix-org/hawkowl/timeouts-2
timeouts 2: electric boogaloo
Diffstat (limited to 'synapse/http/client.py')
| -rw-r--r-- | synapse/http/client.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index d60f87b04e..ec339a92ad 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -93,7 +93,7 @@ class SimpleHttpClient(object): outgoing_requests_counter.labels(method).inc() # log request but strip `access_token` (AS requests for example include this) - logger.info("Sending request %s %s", method, redact_uri(uri.encode('ascii'))) + logger.info("Sending request %s %s", method, redact_uri(uri)) try: request_deferred = treq.request( @@ -108,14 +108,14 @@ class SimpleHttpClient(object): incoming_responses_counter.labels(method, response.code).inc() logger.info( "Received response to %s %s: %s", - method, redact_uri(uri.encode('ascii')), response.code + method, redact_uri(uri), response.code ) defer.returnValue(response) except Exception as e: incoming_responses_counter.labels(method, "ERR").inc() logger.info( "Error sending request to %s %s: %s %s", - method, redact_uri(uri.encode('ascii')), type(e).__name__, e.args[0] + method, redact_uri(uri), type(e).__name__, e.args[0] ) raise |