forked from goodboy/tractor
.log: more correct handling for `get_logger(__name__)` usage
parent
565d7c3ee5
commit
46972df041
tractor
|
@ -193,15 +193,39 @@ def get_logger(
|
||||||
'''
|
'''
|
||||||
log = rlog = logging.getLogger(_root_name)
|
log = rlog = logging.getLogger(_root_name)
|
||||||
|
|
||||||
if name and name != _proj_name:
|
if (
|
||||||
|
name
|
||||||
|
and name != _proj_name
|
||||||
|
):
|
||||||
|
|
||||||
# handling for modules that use ``get_logger(__name__)`` to
|
# NOTE: for handling for modules that use ``get_logger(__name__)``
|
||||||
# avoid duplicate project-package token in msg output
|
# we make the following stylistic choice:
|
||||||
rname, _, tail = name.partition('.')
|
# - always avoid duplicate project-package token
|
||||||
if rname == _root_name:
|
# in msg output: i.e. tractor.tractor _ipc.py in header
|
||||||
name = tail
|
# looks ridiculous XD
|
||||||
|
# - never show the leaf module name in the {name} part
|
||||||
|
# since in python the {filename} is always this same
|
||||||
|
# module-file.
|
||||||
|
|
||||||
|
sub_name: None | str = None
|
||||||
|
rname, _, sub_name = name.partition('.')
|
||||||
|
pkgpath, _, modfilename = sub_name.rpartition('.')
|
||||||
|
|
||||||
|
# NOTE: for tractor itself never include the last level
|
||||||
|
# module key in the name such that something like: eg.
|
||||||
|
# 'tractor.trionics._broadcast` only includes the first
|
||||||
|
# 2 tokens in the (coloured) name part.
|
||||||
|
if rname == 'tractor':
|
||||||
|
sub_name = pkgpath
|
||||||
|
|
||||||
|
if _root_name in sub_name:
|
||||||
|
duplicate, _, sub_name = sub_name.partition('.')
|
||||||
|
|
||||||
|
if not sub_name:
|
||||||
|
log = rlog
|
||||||
|
else:
|
||||||
|
log = rlog.getChild(sub_name)
|
||||||
|
|
||||||
log = rlog.getChild(name)
|
|
||||||
log.level = rlog.level
|
log.level = rlog.level
|
||||||
|
|
||||||
# add our actor-task aware adapter which will dynamically look up
|
# add our actor-task aware adapter which will dynamically look up
|
||||||
|
@ -254,3 +278,7 @@ def get_console_log(
|
||||||
|
|
||||||
def get_loglevel() -> str:
|
def get_loglevel() -> str:
|
||||||
return _default_loglevel
|
return _default_loglevel
|
||||||
|
|
||||||
|
|
||||||
|
# global module logger for tractor itself
|
||||||
|
log = get_logger('tractor')
|
||||||
|
|
Loading…
Reference in New Issue