diff options
| author | martinko | 2011-11-14 19:54:46 +0000 |
|---|---|---|
| committer | martinko | 2011-11-14 19:54:46 +0000 |
| commit | a1ab266694e816f0d4f1646babc4305ee0c99b30 (patch) | |
| tree | 8dac7f47f206d3bf9f2f5783ad46c18087d806f2 /python/skytools/scripting.py | |
| parent | 236972c7dfadcf7ebc654b0585dfd5df94e82e16 (diff) | |
skytools.scripting: datefmt support in logging
Diffstat (limited to 'python/skytools/scripting.py')
| -rw-r--r-- | python/skytools/scripting.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/python/skytools/scripting.py b/python/skytools/scripting.py index a5752f92..5666f0ee 100644 --- a/python/skytools/scripting.py +++ b/python/skytools/scripting.py @@ -167,12 +167,15 @@ def _init_log(job_name, service_name, cf, log_level, is_daemon): # compatibility: specify ini file in script config def_fmt = '%(asctime)s %(process)s %(levelname)s %(message)s' + def_datefmt = '' # None logfile = cf.getfile("logfile", "") if logfile: fstr = cf.get('logfmt_file', def_fmt) + fstr_date = cf.get('logdatefmt_file', def_datefmt) if log_level < logging.INFO: fstr = cf.get('logfmt_file_verbose', fstr) - fmt = logging.Formatter(fstr) + fstr_date = cf.get('logdatefmt_file_verbose', fstr_date) + fmt = logging.Formatter(fstr, fstr_date) size = cf.getint('log_size', 10*1024*1024) num = cf.getint('log_count', 3) hdlr = logging.handlers.RotatingFileHandler( @@ -183,10 +186,12 @@ def _init_log(job_name, service_name, cf, log_level, is_daemon): # if skylog.ini is disabled or not available, log at least to stderr if not got_skylog: fstr = cf.get('logfmt_console', def_fmt) + fstr_date = cf.get('logdatefmt_console', def_datefmt) if log_level < logging.INFO: fstr = cf.get('logfmt_console_verbose', fstr) + fstr_date = cf.get('logdatefmt_console_verbose', fstr_date) hdlr = logging.StreamHandler() - fmt = logging.Formatter(fstr) + fmt = logging.Formatter(fstr, fstr_date) hdlr.setFormatter(fmt) root.addHandler(hdlr) |