Merge pull request #517 from ze42/log_fmt_console

fix(log_fmt_console): double option in config
saltstack-formulas · Dec 27, 2021 · 89f3653 · 89f3653
2 parents 8e56990 + b705e44
commit 89f3653
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
@@ -1594,7 +1594,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
@@ -1085,7 +1085,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'") }}