From b705e44378dc8905e4394362c55cd757afb88be7 Mon Sep 17 00:00:00 2001 From: "Adrien \"ze\" Urban" Date: Thu, 28 Oct 2021 11:41:18 +0200 Subject: [PATCH] fix(log_fmt_console): double option in config When option was specified, it appeared twice in config, making configuration file buggy, and not loaded. --- salt/files/master.d/f_defaults.conf | 2 +- salt/files/minion.d/f_defaults.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 83e6e1851..46ef7ab01 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -1590,7 +1590,7 @@ mine_get: # the coloring of the messages, these color formatters also include padding as # well. Color LogRecord attributes are only available for console logging. # -{{ get_config('log_fmt_console', "'%(colorlevel)s %(colormsg)s'") }} +#log_fmt_console "%(colorlevel)s %(colormsg)s" {{ get_config('log_fmt_console', "'[%(levelname)-8s] %(message)s'") }} {{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }} diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf index fd8e93207..28bceb08c 100644 --- a/salt/files/minion.d/f_defaults.conf +++ b/salt/files/minion.d/f_defaults.conf @@ -1080,7 +1080,7 @@ ext_pillar: # the coloring of the messages, these color formatters also include padding as # well. Color LogRecord attributes are only available for console logging. # -{{ get_config('log_fmt_console', "'%(colorlevel)s %(colormsg)s'") }} +#log_fmt_console "%(colorlevel)s %(colormsg)s" {{ get_config('log_fmt_console', "'[%(levelname)-8s] %(message)s'") }} # {{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }}