From 560c1222672a241d89e74a1befe2a9f778732fdc Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 18 Oct 2019 13:34:33 +0200
Subject: [PATCH] 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.
---
 changelog.d/6197.docker  | 1 +
 docker/conf/log.config   | 2 ++
 synapse/config/logger.py | 5 ++---
 3 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 changelog.d/6197.docker

diff --git a/changelog.d/6197.docker b/changelog.d/6197.docker
new file mode 100644
index 000000000..71fb9cbff
--- /dev/null
+++ b/changelog.d/6197.docker
@@ -0,0 +1 @@
+Fix logging getting lost for the docker image.
diff --git a/docker/conf/log.config b/docker/conf/log.config
index db35e475a..ed418a57c 100644
--- a/docker/conf/log.config
+++ b/docker/conf/log.config
@@ -24,3 +24,5 @@ loggers:
 root:
     level: {{ SYNAPSE_LOG_LEVEL or "INFO" }}
     handlers: [console]
+
+disable_existing_loggers: false
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index d609ec111..be92e33f9 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
 """
 )