summary refs log tree commit diff
path: root/docker/conf
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2022-07-05 10:46:20 +0100
committerGitHub <noreply@github.com>2022-07-05 09:46:20 +0000
commit65e675504fe060e5e99e145be450fe4d492f404f (patch)
tree63eba46476ae5e0419c84266b322fa56f9a25452 /docker/conf
parentAdd missing links to config options (#13166) (diff)
downloadsynapse-65e675504fe060e5e99e145be450fe4d492f404f.tar.xz
Add the ability to set the log level using the `SYNAPSE_TEST_LOG_LEVEL` environment when using `complement.sh`. (#13152)
Diffstat (limited to 'docker/conf')
-rw-r--r--docker/conf/log.config6
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/conf/log.config b/docker/conf/log.config
index d9e85aa533..90b5179838 100644
--- a/docker/conf/log.config
+++ b/docker/conf/log.config
@@ -49,11 +49,17 @@ handlers:
     class: logging.StreamHandler
     formatter: precise
 
+{% if not SYNAPSE_LOG_SENSITIVE %}
+{#
+  If SYNAPSE_LOG_SENSITIVE is unset, then override synapse.storage.SQL to INFO
+  so that DEBUG entries (containing sensitive information) are not emitted.
+#}
 loggers:
     synapse.storage.SQL:
         # beware: increasing this to DEBUG will make synapse log sensitive
         # information such as access tokens.
         level: INFO
+{% endif %}
 
 root:
     level: {{ SYNAPSE_LOG_LEVEL or "INFO" }}