Merge: nixos/matrix-synapse: Fix merging log configuration (#409839)

2025-06-07 12:48:22 +02:00
parent 68f6944b20 28189a7ac0
commit cf0370b028
1 changed files with 7 additions and 6 deletions
@@ -124,12 +124,13 @@ let
  genLogConfigFile =
    logName:
    format.generate "synapse-log-${logName}.yaml" (
-      cfg.log
-      // optionalAttrs (cfg.log ? handlers.journal) {
-        handlers.journal = cfg.log.handlers.journal // {
-          SYSLOG_IDENTIFIER = logName;
-        };
-      }
+      attrsets.recursiveUpdate cfg.log (
+        optionalAttrs (cfg.log ? handlers.journal) {
+          handlers.journal = cfg.log.handlers.journal // {
+            SYSLOG_IDENTIFIER = logName;
+          };
+        }
+      )
    );

  toIntBase8 =