diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-10-18 13:34:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-18 13:34:33 +0200 |
| commit | 560c1222672a241d89e74a1befe2a9f778732fdc (patch) | |
| tree | 26d1d2b04b473cd25ef04d36df31e07dcef8d1f2 | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-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 '')
| -rw-r--r-- | changelog.d/6197.docker | 1 | ||||
| -rw-r--r-- | docker/conf/log.config | 2 | ||||
| -rw-r--r-- | synapse/config/logger.py | 5 |
3 files changed, 5 insertions, 3 deletions
diff --git a/changelog.d/6197.docker b/changelog.d/6197.docker new file mode 100644 index 0000000000..71fb9cbff5 --- /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 db35e475a4..ed418a57cd 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 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 """ ) |