From 08f5f23e8ac9e8a2418ecedb9dc13af38906bf27 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 11 Oct 2019 18:12:57 +0100
Subject: [PATCH] Fix logging config for the docker image

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 000000000000..71fb9cbff532
--- /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 db35e475a470..ed418a57cd9b 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 d609ec111b60..be92e33f9332 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -68,9 +68,6 @@
         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 @@
 root:
     level: INFO
     handlers: [file, console]
+
+disable_existing_loggers: false
 """
 )