fix(log_fmt_console): double option in config

When option was specified, it appeared twice in config, making configuration file buggy, and not loaded.
saltstack-formulas · Oct 28, 2021 · b705e44 · b705e44
1 parent 99b1469
commit b705e44
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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'") }}