janware/jw-python
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-python synced 2026-01-15 01:52:56 +01:00
Code Releases Activity

log.py: Make some variables private

Browse source 
Add leading underscore to variables that should not be visible
outside of log.py. Also do some indentation beautification.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-10-28 10:59:20 +01:00
commit 1cdb38b767
1 changed files with 74 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

146
tools/python/jwutils/log.py
View file

@ -11,18 +11,18 @@ try:
except NameError: except NameError:
basestring = str basestring = str
EMERG = syslog.LOG_EMERG EMERG = syslog.LOG_EMERG
ALERT = syslog.LOG_ALERT ALERT = syslog.LOG_ALERT
CRIT = syslog.LOG_CRIT CRIT = syslog.LOG_CRIT
ERR = syslog.LOG_ERR ERR = syslog.LOG_ERR
WARNING = syslog.LOG_WARNING WARNING = syslog.LOG_WARNING
NOTICE = syslog.LOG_NOTICE NOTICE = syslog.LOG_NOTICE
INFO = syslog.LOG_INFO INFO = syslog.LOG_INFO
DEBUG = syslog.LOG_DEBUG DEBUG = syslog.LOG_DEBUG
DEVEL = syslog.LOG_DEBUG + 1 DEVEL = syslog.LOG_DEBUG + 1
OFF = DEVEL + 1 OFF = DEVEL + 1
level = NOTICE _level = NOTICE
CONSOLE_FONT_BOLD = '\033[1m' CONSOLE_FONT_BOLD = '\033[1m'
CONSOLE_FONT_RED = '\033[31m' CONSOLE_FONT_RED = '\033[31m'
@ -37,37 +37,37 @@ CONSOLE_FONT_WHITE = '\033[37m'
CONSOLE_FONT_BLINK = '\033[5m' CONSOLE_FONT_BLINK = '\033[5m'
CONSOLE_FONT_OFF = '\033[m' CONSOLE_FONT_OFF = '\033[m'
f_position = 'position' f_position = 'position'
f_stderr = 'stderr' f_stderr = 'stderr'
f_stdout = 'stdout' f_stdout = 'stdout'
f_prio = 'prio' f_prio = 'prio'
f_color = 'color' f_color = 'color'
f_default = [ f_position, f_stderr, f_prio, f_color ] f_default = [ f_position, f_stderr, f_prio, f_color ]
flags = set(f_default) _flags = set(f_default)
short_prio_str = { _short_prio_str = {
EMERG : '<Y>', EMERG : '<Y>',
ALERT : '<A>', ALERT : '<A>',
CRIT : '<C>', CRIT : '<C>',
ERR : '<E>', ERR : '<E>',
WARNING : '<W>', WARNING : '<W>',
NOTICE : '<N>', NOTICE : '<N>',
INFO : '<I>', INFO : '<I>',
DEBUG : '<D>', DEBUG : '<D>',
DEVEL : '<V>', DEVEL : '<V>',
} }
prio_colors = { _prio_colors = {
DEVEL : [ "", "" ], DEVEL : [ "", "" ],
DEBUG : [ "", "" ], DEBUG : [ "", "" ],
INFO : [ CONSOLE_FONT_BLUE, CONSOLE_FONT_OFF ], INFO : [ CONSOLE_FONT_BLUE, CONSOLE_FONT_OFF ],
NOTICE : [ CONSOLE_FONT_GREEN, CONSOLE_FONT_OFF ], NOTICE : [ CONSOLE_FONT_GREEN, CONSOLE_FONT_OFF ],
WARNING : [ CONSOLE_FONT_YELLOW, CONSOLE_FONT_OFF ], WARNING : [ CONSOLE_FONT_YELLOW, CONSOLE_FONT_OFF ],
ERR : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_RED, CONSOLE_FONT_OFF ], ERR : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_RED, CONSOLE_FONT_OFF ],
CRIT : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_MAGENTA, CONSOLE_FONT_OFF ], CRIT : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_MAGENTA, CONSOLE_FONT_OFF ],
ALERT : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_MAGENTA, CONSOLE_FONT_OFF ], ALERT : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_MAGENTA, CONSOLE_FONT_OFF ],
EMERG : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_MAGENTA, CONSOLE_FONT_OFF ], EMERG : [ CONSOLE_FONT_BOLD + CONSOLE_FONT_MAGENTA, CONSOLE_FONT_OFF ],
} }
def get_caller_pos(up = 1): def get_caller_pos(up = 1):
@ -77,7 +77,7 @@ def get_caller_pos(up = 1):
def slog(prio, *args, **kwargs): # export def slog(prio, *args, **kwargs): # export
if prio > level: if prio > _level:
return return
msg = '' msg = ''
@ -85,18 +85,18 @@ def slog(prio, *args, **kwargs): # export
color_off = '' color_off = ''
file = sys.stderr file = sys.stderr
if f_prio in flags: if f_prio in _flags:
msg += short_prio_str[prio] + ' ' msg += _short_prio_str[prio] + ' '
if f_position in flags: if f_position in _flags:
if 'caller' in kwargs: if 'caller' in kwargs:
name, line = kwargs['caller'] name, line = kwargs['caller']
else: else:
name, line = get_caller_pos(1) name, line = get_caller_pos(1)
msg += misc.pad(name, 20) + '[' + misc.pad(str(line), 4, True) + ']' msg += misc.pad(name, 20) + '[' + misc.pad(str(line), 4, True) + ']'
if f_color in flags: if f_color in _flags:
color_on, color_off = prio_colors[prio] color_on, color_off = _prio_colors[prio]
if len(args): if len(args):
margs = '' margs = ''
@ -104,10 +104,10 @@ def slog(prio, *args, **kwargs): # export
margs += ' ' + str(a) margs += ' ' + str(a)
msg += color_on + margs + color_off msg += color_on + margs + color_off
if f_stdout in flags: if f_stdout in _flags:
file = sys.stdout file = sys.stdout
if f_stderr in flags: if f_stderr in _flags:
file = sys.stderr file = sys.stderr
if len(msg): if len(msg):
@ -120,41 +120,44 @@ def parse_log_prio_str(prio): # export
raise Exeption("Invalid log priority ", prio) raise Exeption("Invalid log priority ", prio)
except ValueError: except ValueError:
map_prio_str_to_val = { map_prio_str_to_val = {
"EMERG" : EMERG, "EMERG" : EMERG,
"emerg" : EMERG, "emerg" : EMERG,
"ALERT" : ALERT, "ALERT" : ALERT,
"alert" : ALERT, "alert" : ALERT,
"CRIT" : CRIT, "CRIT" : CRIT,
"crit" : CRIT, "crit" : CRIT,
"ERR" : ERR, "ERR" : ERR,
"err" : ERR, "err" : ERR,
"WARNING" : WARNING, "WARNING" : WARNING,
"warning" : WARNING, "warning" : WARNING,
"NOTICE" : NOTICE, "NOTICE" : NOTICE,
"notice" : NOTICE, "notice" : NOTICE,
"INFO" : INFO, "INFO" : INFO,
"info" : INFO, "info" : INFO,
"DEBUG" : DEBUG, "DEBUG" : DEBUG,
"debug" : DEBUG, "debug" : DEBUG,
"DEVEL" : DEVEL, "DEVEL" : DEVEL,
"devel" : DEVEL, "devel" : DEVEL,
"OFF" : OFF, "OFF" : OFF,
"off" : OFF, "off" : OFF,
} }
if prio in map_prio_str_to_val: if prio in map_prio_str_to_val:
return map_prio_str_to_val[prio] return map_prio_str_to_val[prio]
raise Exception("Unknown priority string \"", prio, "\"") raise Exception("Unknown priority string \"", prio, "\"")
def prio_colors(prio): # export
return _prio_colors(prio)
def set_level(level_): # export def set_level(level_): # export
global level global _level
if isinstance(level_, basestring): if isinstance(level_, basestring):
level = parse_log_prio_str(level_) _level = parse_log_prio_str(level_)
return return
level = level_ _level = level_
def set_flags(flags_): # export def set_flags(flags_): # export
global flags global _flags
flags = set(flags_.split(',')) _flags = set(flags_.split(','))
#syslog #syslog
#console #console
@ -170,4 +173,3 @@ def set_flags(flags_): # export
#date #date
#pid #pid
#highlight_first_error #highlight_first_error