paulin/bonobo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[logging] Removes logging colors on windows for now as the codes are mis-interpreted.

Browse Source
This commit is contained in:
Romain Dorgueil
2017-07-16 11:19:06 +02:00
parent d80118f687
commit 258bd6235d
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bonobo/logging.py
View File

@ -8,6 +8,8 @@ from colorama import Fore, Style
from bonobo import settings from bonobo import settings
from bonobo.util.term import CLEAR_EOL from bonobo.util.term import CLEAR_EOL
iswindows = (sys.platform == 'win32')
def get_format(): def get_format():
yield '{b}[%(fg)s%(levelname)s{b}][{w}' yield '{b}[%(fg)s%(levelname)s{b}][{w}'
@ -18,9 +20,9 @@ def get_format():
colors = { colors = {
'b': Fore.BLACK, 'b': '' if iswindows else Fore.BLACK,
'w': Fore.LIGHTBLACK_EX, 'w': '' if iswindows else Fore.LIGHTBLACK_EX,
'r': Style.RESET_ALL, 'r': '' if iswindows else Style.RESET_ALL,
} }
format = (''.join(get_format())).format(**colors) format = (''.join(get_format())).format(**colors)
@ -28,7 +30,9 @@ format = (''.join(get_format())).format(**colors)
class Filter(logging.Filter): class Filter(logging.Filter):
def filter(self, record): def filter(self, record):
record.spent = record.relativeCreated // 1000 record.spent = record.relativeCreated // 1000
if record.levelname == 'DEBG': if iswindows:
record.fg = ''
elif record.levelname == 'DEBG':
record.fg = Fore.LIGHTBLACK_EX record.fg = Fore.LIGHTBLACK_EX
elif record.levelname == 'INFO': elif record.levelname == 'INFO':
record.fg = Fore.LIGHTWHITE_EX record.fg = Fore.LIGHTWHITE_EX
@ -46,6 +50,9 @@ class Filter(logging.Filter):
class Formatter(logging.Formatter): class Formatter(logging.Formatter):
def formatException(self, ei): def formatException(self, ei):
tb = super().formatException(ei) tb = super().formatException(ei)
if iswindows:
return textwrap.indent(tb, ' | ')
else:
return textwrap.indent(tb, Fore.BLACK + ' | ' + Fore.WHITE) return textwrap.indent(tb, Fore.BLACK + ' | ' + Fore.WHITE)