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: Improve console color implementation

Browse source 
o Remove unnecessary function prio_colors()
o Don't output color codes on non-TTY output

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-12-23 18:01:53 +01:00
commit 26d322023a
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ def slog(prio, *args, **kwargs): # export
msg += misc.pad(name, _file_name_len) + '[' + misc.pad(str(line), 4, True) + ']' msg += misc.pad(name, _file_name_len) + '[' + 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 = console_color_chars(prio)
msg += _log_prefix msg += _log_prefix
@ -174,8 +174,10 @@ def parse_log_prio_str(prio): # export
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 def console_color_chars(prio): # export
return _prio_colors(prio) if not sys.stdout.isatty():
return [ '', '' ]
return _prio_colors[prio]
def set_level(level_): # export def set_level(level_): # export
global _level global _level
@ -222,6 +224,3 @@ def set_filename_length(l): # export
if l: if l:
_file_name_len = l _file_name_len = l
return r return r
def console_color_chars(prio): # export
return _prio_colors[prio]