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/site.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/site.py')
| -rw-r--r-- | synapse/http/site.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py index f0828c6542..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) + 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] |