diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-25 12:21:32 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-25 12:21:32 +0100 |
| commit | 6fa36c22fa1f61b9b2e3c0ad82f448713859fe88 (patch) | |
| tree | 7b224995015827c11db8e01b8f18d053e0102938 /docker | |
| parent | Grafana dashboard updates (diff) | |
| parent | Increase default log level for docker image to INFO. (#5547) (diff) | |
| download | synapse-6fa36c22fa1f61b9b2e3c0ad82f448713859fe88.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/conf/log.config | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 24921eb098..0939cadf39 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ # docker build -f docker/Dockerfile --build-arg PYTHON_VERSION=3.6 . # -ARG PYTHON_VERSION=2 +ARG PYTHON_VERSION=3.7 ### ### Stage 0: builder diff --git a/docker/conf/log.config b/docker/conf/log.config index 1851995802..895e45d20b 100644 --- a/docker/conf/log.config +++ b/docker/conf/log.config @@ -16,14 +16,11 @@ handlers: filters: [context] loggers: - synapse: - 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: {{ SYNAPSE_LOG_LEVEL or "WARNING" }} + level: INFO root: - level: {{ SYNAPSE_LOG_LEVEL or "WARNING" }} + level: {{ SYNAPSE_LOG_LEVEL or "INFO" }} handlers: [console] |