Unverified Commit cf0370b0 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by GitHub
Browse files

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

parents 68f6944b 28189a7a

nixos/modules/services/matrix/synapse.nix

+7 −6
Original line number Diff line number Diff line
@@ -124,12 +124,13 @@ let 
  genLogConfigFile =

    logName:

    format.generate "synapse-log-${logName}.yaml" (

      cfg.log

      // optionalAttrs (cfg.log ? handlers.journal) {

      attrsets.recursiveUpdate cfg.log (

        optionalAttrs (cfg.log ? handlers.journal) {

          handlers.journal = cfg.log.handlers.journal // {

            SYSLOG_IDENTIFIER = logName;

          };

        }

      )

    );



  toIntBase8 =