move log formatters to values

Author: shcherbak

charts/synapse/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 1.151.0
 description: matrix synapse kubernetes deployment
 name: synapse
-version: 2.8.0
+version: 2.8.1

charts/synapse/templates/synapse-secret.yaml

@@ -396,13 +396,8 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
-      precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
-      console:
-        class: logging.StreamHandler
-        formatter: precise
+    formatters: {{ toYaml $.Values.synapse.logFormatters | nindent 6 }}
+    handlers: {{ toYaml $.Values.synapse.logHandlers | nindent 6 }}
     loggers:
       synapse.handlers.pagination:
         level: INFO

charts/synapse/tests/golden/fixtures/test-synapse-secret-no-pgbouncer-stream-writers.golden.yaml

@@ -248,10 +248,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -511,10 +511,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -782,10 +782,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -1053,10 +1053,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -1331,10 +1331,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -1609,10 +1609,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -1880,10 +1880,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -2158,10 +2158,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -2435,10 +2435,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -2708,10 +2708,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -2981,10 +2981,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -3259,10 +3259,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -3537,10 +3537,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -3800,10 +3800,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -4078,10 +4078,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -4356,10 +4356,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -4627,10 +4627,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -4898,10 +4898,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -5176,10 +5176,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -5454,10 +5454,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -5732,10 +5732,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise
@@ -6003,10 +6003,10 @@ stringData:
   log.config: |
     ---
     disable_existing_loggers: false
-    formatters:
+    formatters: 
       precise:
-        format: "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s"
-    handlers:
+        format: '%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(request)s - %(message)s'
+    handlers: 
       console:
         class: logging.StreamHandler
         formatter: precise