Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 02:34:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

factor out uri redaction into a method on http

Browse source
This commit is contained in:
Michael Telatynski 2018-06-05 18:31:40 +01:00
parent 09503126df
commit e6cbf47773
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
synapse/http/client.py
View file

@ -19,8 +19,7 @@ from OpenSSL.SSL import VERIFY_NONE
from synapse.api.errors import (
CodeMessageException, MatrixCodeMessageException, SynapseError, Codes,
)
from synapse.http import cancelled_to_request_timed_out_error
from synapse.http.site import ACCESS_TOKEN_RE
from synapse.http import cancelled_to_request_timed_out_error, redact_uri
from synapse.util.async import add_timeout_to_deferred
from synapse.util.caches import CACHE_SIZE_FACTOR
from synapse.util.logcontext import make_deferred_yieldable
@ -92,10 +91,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, ACCESS_TOKEN_RE.sub(
r'\1<redacted>\3',
uri
))
logger.info("Sending request %s %s", method, redact_uri(uri))
try:
request_deferred = self.agent.request(