Browse Source

fix(log_fmt_console): double option in config

When option was specified, it appeared twice in config, making configuration
file buggy, and not loaded.
tags/v1.10.0
Adrien "ze" Urban 3 years ago
parent
commit
b705e44378
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      salt/files/master.d/f_defaults.conf
  2. +1
    -1
      salt/files/minion.d/f_defaults.conf

+ 1
- 1
salt/files/master.d/f_defaults.conf View File

# 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'") }}

+ 1
- 1
salt/files/minion.d/f_defaults.conf View File

# 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'") }}

Loading…
Cancel
Save