summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-14 03:57:02 +1000
committerAmber Brown <hawkowl@atleastfornow.net>2018-09-14 03:57:02 +1000
commitc971aa7b9d5b4d3900404a285f34dd5004a76f37 (patch)
tree23cf5a0117d87446f9dbc022d564c30b06e061e9
parentfix (diff)
downloadsynapse-c971aa7b9d5b4d3900404a285f34dd5004a76f37.tar.xz
fix
-rw-r--r--synapse/http/site.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py
index 18f2d37e00..e1e53e8ae5 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -85,7 +85,10 @@ class SynapseRequest(Request):
         return "%s-%i" % (self.method, self.request_seq)
 
     def get_redacted_uri(self):
-        return redact_uri(self.uri.decode('ascii'))
+        uri = self.uri
+        if isinstance(uri, bytes):
+            uri = self.uri.decode('ascii')
+        return redact_uri(uri)
 
     def get_user_agent(self):
         return self.requestHeaders.getRawHeaders(b"User-Agent", [None])[-1]