diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-07-29 13:56:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-29 13:56:06 -0400 |
| commit | a53e0160a2d520b92365e00647640fb7eac955dd (patch) | |
| tree | 8d0be4adbcc7d6f9b5040bfef296bf2db88b45ad /synapse/http/matrixfederationclient.py | |
| parent | Remove from the event_relations table when purging historical events. (#7978) (diff) | |
| download | synapse-a53e0160a2d520b92365e00647640fb7eac955dd.tar.xz | |
Ensure the msg property of HttpResponseException is a string. (#7979)
Diffstat (limited to 'synapse/http/matrixfederationclient.py')
| -rw-r--r-- | synapse/http/matrixfederationclient.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py index 148eeb19dc..ea026ed9f4 100644 --- a/synapse/http/matrixfederationclient.py +++ b/synapse/http/matrixfederationclient.py @@ -447,6 +447,7 @@ class MatrixFederationHttpClient(object): ).inc() set_tag(tags.HTTP_STATUS_CODE, response.code) + response_phrase = response.phrase.decode("ascii", errors="replace") if 200 <= response.code < 300: logger.debug( @@ -454,7 +455,7 @@ class MatrixFederationHttpClient(object): request.txn_id, request.destination, response.code, - response.phrase.decode("ascii", errors="replace"), + response_phrase, ) pass else: @@ -463,7 +464,7 @@ class MatrixFederationHttpClient(object): request.txn_id, request.destination, response.code, - response.phrase.decode("ascii", errors="replace"), + response_phrase, ) # :'( # Update transactions table? @@ -487,7 +488,7 @@ class MatrixFederationHttpClient(object): ) body = None - e = HttpResponseException(response.code, response.phrase, body) + e = HttpResponseException(response.code, response_phrase, body) # Retry if the error is a 429 (Too Many Requests), # otherwise just raise a standard HttpResponseException |