Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #517 from ze42/log_fmt_console 

fix(log_fmt_console): double option in config
This commit is contained in:
N 2021-12-27 17:54:52 +00:00 committed by GitHub
parent 8e56990126 b705e44378
commit 89f3653de9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/master.d/f_defaults.conf
View File

@ -1594,7 +1594,7 @@ mine_get:
# the coloring of the messages, these color formatters also include padding as # the coloring of the messages, these color formatters also include padding as
# well. Color LogRecord attributes are only available for console logging. # 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_console', "'[%(levelname)-8s] %(message)s'") }}
{{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }} {{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }}

2
salt/files/minion.d/f_defaults.conf
View File

@ -1085,7 +1085,7 @@ ext_pillar:
# the coloring of the messages, these color formatters also include padding as # the coloring of the messages, these color formatters also include padding as
# well. Color LogRecord attributes are only available for console logging. # 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_console', "'[%(levelname)-8s] %(message)s'") }}
# #
{{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }} {{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }}