summary refs log tree commit diff
path: root/synapse/logging/opentracing.py
diff options
context:
space:
mode:
authorJorik Schellekens <joriks@matrix.org>2019-09-05 17:10:10 +0100
committerJorik Schellekens <joriks@matrix.org>2019-09-05 17:10:10 +0100
commitba95fe64fafff8705e977a17319851773b5fa41e (patch)
tree54c916363c38e089431ca60c8bd7a875dc38ae48 /synapse/logging/opentracing.py
parentNicer replication send trace name (diff)
parentMerge pull request #5984 from matrix-org/joriks/opentracing_link_send_to_edu_... (diff)
downloadsynapse-ba95fe64fafff8705e977a17319851773b5fa41e.tar.xz
Merge remote-tracking branch 'origin/develop' into joriks/opentracing_trace_sendtime github/joriks/opentracing_trace_sendtime joriks/opentracing_trace_sendtime
Diffstat (limited to 'synapse/logging/opentracing.py')
-rw-r--r--synapse/logging/opentracing.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py

index dbf80e2024..2c34b54702 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py
@@ -319,7 +319,7 @@ def whitelisted_homeserver(destination): Args: destination (str) """ - _homeserver_whitelist + if _homeserver_whitelist: return _homeserver_whitelist.match(destination) return False