summary refs log tree commit diff
diff options
context:
space:
mode:
authorkaiyou <pierre@jaury.eu>2018-05-01 20:49:52 +0200
committerkaiyou <pierre@jaury.eu>2018-05-01 20:50:03 +0200
commit4f2e898c29de5b51e8c5893afa64e5b43d25048f (patch)
treeff6e289a22aee9d3ab9e1e87cfffe1ed7826fcbc
parentFix the documentation about 'POSTGRES_DB' (diff)
downloadsynapse-4f2e898c29de5b51e8c5893afa64e5b43d25048f.tar.xz
Make the logging level configurable
Diffstat (limited to '')
-rw-r--r--contrib/docker/conf/log.config6
-rw-r--r--contrib/docker/docker-compose.yml1
2 files changed, 4 insertions, 3 deletions
diff --git a/contrib/docker/conf/log.config b/contrib/docker/conf/log.config
index b5c907c4f9..1851995802 100644
--- a/contrib/docker/conf/log.config
+++ b/contrib/docker/conf/log.config
@@ -17,13 +17,13 @@ handlers:
 
 loggers:
     synapse:
-        level: INFO
+        level: {{ SYNAPSE_LOG_LEVEL or "WARNING" }}
 
     synapse.storage.SQL:
         # beware: increasing this to DEBUG will make synapse log sensitive
         # information such as access tokens.
-        level: INFO
+        level: {{ SYNAPSE_LOG_LEVEL or "WARNING" }}
 
 root:
-    level: INFO
+    level: {{ SYNAPSE_LOG_LEVEL or "WARNING" }}
     handlers: [console]
diff --git a/contrib/docker/docker-compose.yml b/contrib/docker/docker-compose.yml
index 46e72601d3..0b531949e0 100644
--- a/contrib/docker/docker-compose.yml
+++ b/contrib/docker/docker-compose.yml
@@ -15,6 +15,7 @@ services:
       - SYNAPSE_SERVER_NAME=my.matrix.host
       - SYNAPSE_REPORT_STATS=no
       - SYNAPSE_ENABLE_REGISTRATION=yes
+      - SYNAPSE_LOG_LEVEL=INFO
       - POSTGRES_PASSWORD=changeme
     volumes:
       # You may either store all the files in a local folder