valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1983 from s0undt3ch/issues/1981

Browse Source 
Keep configuration variables to the minimum possible. Refs #1981.
This commit is contained in:
Pedro Algarvio 2012-09-06 12:06:10 -07:00
commit d0338d5e05
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/master.template
View File

@ -314,8 +314,7 @@
# The date and time format used in log messages. Allowed date/time formating
# can be seen here:
# http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'
#log_datefmt: '%Y-%m-%d %H:%M:%S'
#
# The format of the console logging messages. Allowed formatting options can
# be seen here:

3
conf/minion.template
View File

@ -232,8 +232,7 @@
#
# The date and time format used in log messages. Allowed date/time formating
# can be seen on http://docs.python.org/library/time.html#time.strftime
#log_datefmt: '%H:%M:%S'
#log_datefmt_logfile: '%Y-%m-%d %H:%M:%S'
#log_datefmt: '%Y-%m-%d %H:%M:%S'
#
# The format of the console logging messages. Allowed formatting options can
# be seen on http://docs.python.org/library/logging.html#logrecord-attributes

5
salt/config.py
View File

@ -27,8 +27,7 @@ from salt.exceptions import SaltClientError
log = logging.getLogger(__name__)
__dflt_log_datefmt = '%H:%M:%S'
__dflt_log_datefmt_logfile = '%Y-%m-%d %H:%M:%S'
__dflt_log_datefmt = '%Y-%m-%d %H:%M:%S'
__dflt_log_fmt_console = '[%(levelname)-8s] %(message)s'
__dflt_log_fmt_logfile = '%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'
@ -191,7 +190,6 @@ def minion_config(path):
'log_level': None,
'log_level_logfile': None,
'log_datefmt': __dflt_log_datefmt,
'log_datefmt_logfile': __dflt_log_datefmt_logfile,
'log_fmt_console': __dflt_log_fmt_console,
'log_fmt_logfile': __dflt_log_fmt_logfile,
'log_granular_levels': {},
@ -285,7 +283,6 @@ def master_config(path):
'log_level': None,
'log_level_logfile': None,
'log_datefmt': __dflt_log_datefmt,
'log_datefmt_logfile': __dflt_log_datefmt_logfile,
'log_fmt_console': __dflt_log_fmt_console,
'log_fmt_logfile': __dflt_log_fmt_logfile,
'log_granular_levels': {},

4
salt/utils/parsers.py
View File

@ -296,9 +296,7 @@ class LogLevelMixIn(object):
logfmt = self.config.get(
'log_fmt_logfile', self.config['log_fmt_console']
)
datefmt = self.config.get(
'log_datefmt_logfile', self.config['log_datefmt']
)
datefmt = self.config.get('log_datefmt', '%Y-%m-%d %H:%M:%S')
log.setup_logfile_logger(
self.config[lfkey],
loglevel,