IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added custom log formatter util.LogFormatter that makes the human-readable time stamp in UTC

Browse Source
This commit is contained in:
Jason Gerard DeRose 2008-10-31 20:25:33 -06:00
parent 5e5a83e4e8
commit 242a8183a7
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipalib/constants.py
View File

@ -45,8 +45,8 @@ LOG_FORMAT_STDERR_DEBUG = ' '.join([
# Tab-delimited log format for file (easy to opened in a spreadsheet): # Tab-delimited log format for file (easy to opened in a spreadsheet):
LOG_FORMAT_FILE = ' '.join([ LOG_FORMAT_FILE = '\t'.join([
'%(created)f', '%(asctime)s',
'%(levelname)s', '%(levelname)s',
'%(message)r', # Using %r for repr() so message is a single line '%(message)r', # Using %r for repr() so message is a single line
'%(lineno)d', '%(lineno)d',

4
ipalib/plugable.py
View File

@ -793,7 +793,7 @@ class API(DictProxy):
stderr.setLevel(logging.INFO) stderr.setLevel(logging.INFO)
else: else:
stderr.setLevel(logging.WARNING) stderr.setLevel(logging.WARNING)
stderr.setFormatter(logging.Formatter(format)) stderr.setFormatter(util.LogFormatter(format))
log.addHandler(stderr) log.addHandler(stderr)
# Add file handler: # Add file handler:
@ -807,7 +807,7 @@ class API(DictProxy):
log.warn('Could not create log_dir %r', log_dir) log.warn('Could not create log_dir %r', log_dir)
return return
handler = logging.FileHandler(self.env.log) handler = logging.FileHandler(self.env.log)
handler.setFormatter(logging.Formatter(self.env.log_format_file)) handler.setFormatter(util.LogFormatter(self.env.log_format_file))
if self.env.debug: if self.env.debug:
handler.setLevel(logging.DEBUG) handler.setLevel(logging.DEBUG)
else: else:

9
ipalib/util.py
View File

@ -25,6 +25,8 @@ import os
from os import path from os import path
import imp import imp
import optparse import optparse
import logging
import time
import krbV import krbV
@ -122,3 +124,10 @@ def add_global_options(parser=None):
help='Produce more verbose output', help='Produce more verbose output',
) )
return parser return parser
class LogFormatter(logging.Formatter):
"""
Log formatter that uses UTC for all timestamps.
"""
converter = time.gmtime