From f817fc9ad51eb8b409894136d7eab2b7448a7f09 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 25 Jun 2019 05:20:53 +0100
Subject: Update docker image to use Python 3.7. (#5546)

Python 3.7 is apparently faster than 3.6, and should be mature enough.
---
 changelog.d/5546.feature | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5546.feature

(limited to 'changelog.d')

diff --git a/changelog.d/5546.feature b/changelog.d/5546.feature
new file mode 100644
index 0000000000..16952b62fc
--- /dev/null
+++ b/changelog.d/5546.feature
@@ -0,0 +1 @@
+Update docker image to use Python 3.7.
-- 
cgit 1.4.1


From fe2d876e2a3c970c70ca4e7c1508624279cf4ed5 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Tue, 25 Jun 2019 05:38:38 +0100
Subject: Increase default log level for docker image to INFO. (#5547)

Fixes #3370.
---
 changelog.d/5547.feature | 1 +
 docker/conf/log.config   | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/5547.feature

(limited to 'changelog.d')

diff --git a/changelog.d/5547.feature b/changelog.d/5547.feature
new file mode 100644
index 0000000000..509e36c7ea
--- /dev/null
+++ b/changelog.d/5547.feature
@@ -0,0 +1 @@
+Increase default log level for docker image to INFO. It can still be changed by editing the generated log.config file.
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]
-- 
cgit 1.4.1