Unverified Commit e5928d9a authored by Maximilian Bosch's avatar Maximilian Bosch
Browse files

nixos/synapse: `mkDefault` each value of the log config

That way it's not even needed to specify an `mkForce` when changing
existing attributes, e.g. root's log level.
parent cb67bb03
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -393,12 +393,14 @@ in {
        description = mdDoc ''
          Default configuration for the loggers used by `matrix-synapse` and its workers.
          The defaults are added with the default priority which means that
          these will be merged with additional declarations. For instance
          these will be merged with additional declarations. These additional
          declarations also take precedence over the defaults when declared
          with at least normal priority. For instance
          the log-level for synapse and its workers can be changed like this:

          ```nix
          { lib, ... }: {
            services.matrix-synapse.log.root.level = lib.mkForce "WARNING";
            services.matrix-synapse.log.root.level = "WARNING";
          }
          ```

@@ -1042,7 +1044,7 @@ in {
    # default them, so they are additive
    services.matrix-synapse.extras = defaultExtras;

    services.matrix-synapse.log = defaultCommonLogConfig;
    services.matrix-synapse.log = mapAttrsRecursive (const mkDefault) defaultCommonLogConfig;

    users.users.matrix-synapse = {
      group = "matrix-synapse";