Fix some b'abcd' noise in logs and metrics

Python 3 compatibility: make sure that we decode some byte sequences before we
use them to create log lines and metrics labels.
This commit is contained in:
Richard van der Hoff 2018-09-17 16:15:42 +01:00
parent c9c50284d7
commit f00a9d2636
2 changed files with 8 additions and 5 deletions

View file

@ -244,7 +244,10 @@ class MatrixFederationHttpClient(object):
request_deferred,
)
log_result = "%d %s" % (response.code, response.phrase,)
log_result = "%d %s" % (
response.code,
response.phrase.decode('ascii', errors='replace'),
)
break
except Exception as e:
if not retry_on_dns_fail and isinstance(e, DNSLookupError):