summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-10-18 13:34:33 +0200
committerGitHub <noreply@github.com>2019-10-18 13:34:33 +0200
commit560c1222672a241d89e74a1befe2a9f778732fdc (patch)
tree26d1d2b04b473cd25ef04d36df31e07dcef8d1f2 /synapse/config
parentMerge branch 'master' into develop (diff)
downloadsynapse-560c1222672a241d89e74a1befe2a9f778732fdc.tar.xz
Fix logging config for the docker image (#6197)
Turns out that loggers that are instantiated before the config is loaded get
turned off.

Also bring the logging config that is generated by --generate-config into line.

Fixes #6194.
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/logger.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index d609ec111b..be92e33f93 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -68,9 +68,6 @@ handlers:
         filters: [context]
 
 loggers:
-    synapse:
-        level: INFO
-
     synapse.storage.SQL:
         # beware: increasing this to DEBUG will make synapse log sensitive
         # information such as access tokens.
@@ -79,6 +76,8 @@ loggers:
 root:
     level: INFO
     handlers: [file, console]
+
+disable_existing_loggers: false
 """
 )