Move out to own function make_formatter.
Easier to reuse in application code, further custom handlers.
This commit is contained in:
parent
189e15748a
commit
c25b990317
1 changed files with 11 additions and 8 deletions
|
|
@ -54,14 +54,7 @@ def add_loud(log):
|
||||||
|
|
||||||
def add_root_handler(level):
|
def add_root_handler(level):
|
||||||
handler = StreamHandler()
|
handler = StreamHandler()
|
||||||
datefmt = '%Y-%m-%dT%H:%M:%S'
|
handler.setFormatter(make_formatter(level))
|
||||||
if level <= LOUD:
|
|
||||||
formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}.{lineno}:{message}', style='{', datefmt=datefmt)
|
|
||||||
elif level <= DEBUG:
|
|
||||||
formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}:{message}', style='{', datefmt=datefmt)
|
|
||||||
else:
|
|
||||||
formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}:{message}', style='{', datefmt=datefmt)
|
|
||||||
handler.setFormatter(formatter)
|
|
||||||
handler.setLevel(level)
|
handler.setLevel(level)
|
||||||
root.addHandler(handler)
|
root.addHandler(handler)
|
||||||
return handler
|
return handler
|
||||||
|
|
@ -222,3 +215,13 @@ def main_decorator(main):
|
||||||
add_root_handler(level)
|
add_root_handler(level)
|
||||||
return main(argv, *args, **kwargs)
|
return main(argv, *args, **kwargs)
|
||||||
return wrapped
|
return wrapped
|
||||||
|
|
||||||
|
def make_formatter(level):
|
||||||
|
datefmt = '%Y-%m-%dT%H:%M:%S'
|
||||||
|
if level <= LOUD:
|
||||||
|
formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}.{lineno}:{message}', style='{', datefmt=datefmt)
|
||||||
|
elif level <= DEBUG:
|
||||||
|
formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}.{funcName}:{message}', style='{', datefmt=datefmt)
|
||||||
|
else:
|
||||||
|
formatter = Formatter('[{asctime}.{msecs:03.0f}] {levelname}:{name}:{message}', style='{', datefmt=datefmt)
|
||||||
|
return formatter
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue