Compare commits
No commits in common. "84aea8d273e3b8e88ffbb6372c2d9421b4230753" and "e015ad62e503b4b00480a12d60f4a7f961066d8b" have entirely different histories.
84aea8d273
...
e015ad62e5
|
|
@ -65,11 +65,7 @@ def loglevel(request):
|
||||||
import tractor
|
import tractor
|
||||||
orig = tractor.log._default_loglevel
|
orig = tractor.log._default_loglevel
|
||||||
level = tractor.log._default_loglevel = request.config.option.loglevel
|
level = tractor.log._default_loglevel = request.config.option.loglevel
|
||||||
log = tractor.log.get_console_log(
|
tractor.log.get_console_log(level)
|
||||||
level=level,
|
|
||||||
name='tractor', # <- enable root logger
|
|
||||||
)
|
|
||||||
log.info(f'Test-harness logging level: {level}\n')
|
|
||||||
yield level
|
yield level
|
||||||
tractor.log._default_loglevel = orig
|
tractor.log._default_loglevel = orig
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,8 +17,9 @@ from tractor.log import (
|
||||||
get_console_log,
|
get_console_log,
|
||||||
get_logger,
|
get_logger,
|
||||||
)
|
)
|
||||||
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
|
||||||
|
|
||||||
_resource: int = 0
|
_resource: int = 0
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ from .ipc._uds import UDSAddress
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from ._runtime import Actor
|
from ._runtime import Actor
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
# TODO, maybe breakout the netns key to a struct?
|
# TODO, maybe breakout the netns key to a struct?
|
||||||
|
|
@ -259,8 +259,6 @@ def wrap_address(
|
||||||
|
|
||||||
case _:
|
case _:
|
||||||
# import pdbp; pdbp.set_trace()
|
# import pdbp; pdbp.set_trace()
|
||||||
# from tractor.devx import mk_pdb
|
|
||||||
# mk_pdb().set_trace()
|
|
||||||
raise TypeError(
|
raise TypeError(
|
||||||
f'Can not wrap unwrapped-address ??\n'
|
f'Can not wrap unwrapped-address ??\n'
|
||||||
f'type(addr): {type(addr)!r}\n'
|
f'type(addr): {type(addr)!r}\n'
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ if TYPE_CHECKING:
|
||||||
CallerInfo,
|
CallerInfo,
|
||||||
)
|
)
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class Unresolved:
|
class Unresolved:
|
||||||
|
|
@ -2391,18 +2391,16 @@ async def open_context_from_portal(
|
||||||
case trio.Cancelled():
|
case trio.Cancelled():
|
||||||
logmeth = log.cancel
|
logmeth = log.cancel
|
||||||
cause: str = 'cancelled'
|
cause: str = 'cancelled'
|
||||||
msg: str = (
|
|
||||||
f'ctx {ctx.side!r}-side {cause!r} with,\n'
|
|
||||||
f'{ctx.repr_outcome()!r}\n'
|
|
||||||
)
|
|
||||||
|
|
||||||
# XXX explicitly report on any non-graceful-taskc cases
|
# XXX explicitly report on any non-graceful-taskc cases
|
||||||
case _:
|
case _:
|
||||||
cause: str = 'errored'
|
cause: str = 'errored'
|
||||||
logmeth = log.exception
|
logmeth = log.exception
|
||||||
msg: str = f'ctx {ctx.side!r}-side {cause!r} with,\n'
|
|
||||||
|
|
||||||
logmeth(msg)
|
logmeth(
|
||||||
|
f'ctx {ctx.side!r}-side {cause!r} with,\n'
|
||||||
|
f'{ctx.repr_outcome()!r}\n'
|
||||||
|
)
|
||||||
|
|
||||||
if debug_mode():
|
if debug_mode():
|
||||||
# async with debug.acquire_debug_lock(portal.actor.uid):
|
# async with debug.acquire_debug_lock(portal.actor.uid):
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ if TYPE_CHECKING:
|
||||||
from ._runtime import Actor
|
from ._runtime import Actor
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
@acm
|
@acm
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ if TYPE_CHECKING:
|
||||||
from ._spawn import SpawnMethodKey
|
from ._spawn import SpawnMethodKey
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def _mp_main(
|
def _mp_main(
|
||||||
|
|
@ -72,15 +72,11 @@ def _mp_main(
|
||||||
spawn_ctx: mp.context.BaseContext = try_set_start_method(start_method)
|
spawn_ctx: mp.context.BaseContext = try_set_start_method(start_method)
|
||||||
assert spawn_ctx
|
assert spawn_ctx
|
||||||
|
|
||||||
# XXX, enable root log at level
|
|
||||||
if actor.loglevel is not None:
|
if actor.loglevel is not None:
|
||||||
log.info(
|
log.info(
|
||||||
f'Setting loglevel for {actor.uid} to {actor.loglevel!r}'
|
f'Setting loglevel for {actor.uid} to {actor.loglevel}'
|
||||||
)
|
|
||||||
get_console_log(
|
|
||||||
level=actor.loglevel,
|
|
||||||
name='tractor',
|
|
||||||
)
|
)
|
||||||
|
get_console_log(actor.loglevel)
|
||||||
|
|
||||||
# TODO: use scops headers like for `trio` below!
|
# TODO: use scops headers like for `trio` below!
|
||||||
# (well after we libify it maybe..)
|
# (well after we libify it maybe..)
|
||||||
|
|
@ -130,12 +126,8 @@ def _trio_main(
|
||||||
parent_addr=parent_addr
|
parent_addr=parent_addr
|
||||||
)
|
)
|
||||||
|
|
||||||
# XXX, enable root log at level
|
|
||||||
if actor.loglevel is not None:
|
if actor.loglevel is not None:
|
||||||
get_console_log(
|
get_console_log(actor.loglevel)
|
||||||
level=actor.loglevel,
|
|
||||||
name='tractor',
|
|
||||||
)
|
|
||||||
log.info(
|
log.info(
|
||||||
f'Starting `trio` subactor from parent @ '
|
f'Starting `trio` subactor from parent @ '
|
||||||
f'{parent_addr}\n'
|
f'{parent_addr}\n'
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ from ._streaming import (
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from ._runtime import Actor
|
from ._runtime import Actor
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class Portal:
|
class Portal:
|
||||||
|
|
|
||||||
|
|
@ -289,12 +289,10 @@ async def open_root_actor(
|
||||||
for uw_addr in uw_reg_addrs
|
for uw_addr in uw_reg_addrs
|
||||||
]
|
]
|
||||||
|
|
||||||
loglevel: str = (
|
loglevel = (
|
||||||
loglevel
|
loglevel
|
||||||
or
|
or log._default_loglevel
|
||||||
log._default_loglevel
|
).upper()
|
||||||
)
|
|
||||||
loglevel: str = loglevel.upper()
|
|
||||||
|
|
||||||
if (
|
if (
|
||||||
debug_mode
|
debug_mode
|
||||||
|
|
@ -325,10 +323,7 @@ async def open_root_actor(
|
||||||
)
|
)
|
||||||
|
|
||||||
assert loglevel
|
assert loglevel
|
||||||
_log = log.get_console_log(
|
_log = log.get_console_log(loglevel)
|
||||||
level=loglevel,
|
|
||||||
name='tractor',
|
|
||||||
)
|
|
||||||
assert _log
|
assert _log
|
||||||
|
|
||||||
# TODO: factor this into `.devx._stackscope`!!
|
# TODO: factor this into `.devx._stackscope`!!
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ if TYPE_CHECKING:
|
||||||
from .ipc import Channel
|
from .ipc import Channel
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
# TODO: the list
|
# TODO: the list
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ if TYPE_CHECKING:
|
||||||
from .ipc import IPCServer
|
from .ipc import IPCServer
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class ActorNursery:
|
class ActorNursery:
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ from tractor.msg import (
|
||||||
import wrapt
|
import wrapt
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
# TODO: yeah, i don't love this and we should prolly just
|
# TODO: yeah, i don't love this and we should prolly just
|
||||||
# write a decorator that actually keeps a stupid ref to the func
|
# write a decorator that actually keeps a stupid ref to the func
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ from tractor import (
|
||||||
)
|
)
|
||||||
from tractor.devx import debug
|
from tractor.devx import debug
|
||||||
|
|
||||||
log = logmod.get_logger()
|
log = logmod.get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ from ._sigint import (
|
||||||
_ctlc_ignore_header as _ctlc_ignore_header
|
_ctlc_ignore_header as _ctlc_ignore_header
|
||||||
)
|
)
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
# ----------------
|
# ----------------
|
||||||
# XXX PKG TODO XXX
|
# XXX PKG TODO XXX
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ _crash_msg: str = (
|
||||||
'Opening a pdb REPL in crashed actor'
|
'Opening a pdb REPL in crashed actor'
|
||||||
)
|
)
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__package__)
|
||||||
|
|
||||||
|
|
||||||
class BoxedMaybeException(Struct):
|
class BoxedMaybeException(Struct):
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ if TYPE_CHECKING:
|
||||||
Actor,
|
Actor,
|
||||||
)
|
)
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
_ctlc_ignore_header: str = (
|
_ctlc_ignore_header: str = (
|
||||||
'Ignoring SIGINT while debug REPL in use'
|
'Ignoring SIGINT while debug REPL in use'
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ from ._sigint import (
|
||||||
_ctlc_ignore_header as _ctlc_ignore_header
|
_ctlc_ignore_header as _ctlc_ignore_header
|
||||||
)
|
)
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__package__)
|
||||||
|
|
||||||
|
|
||||||
async def maybe_wait_for_debugger(
|
async def maybe_wait_for_debugger(
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ if TYPE_CHECKING:
|
||||||
# from ._post_mortem import BoxedMaybeException
|
# from ._post_mortem import BoxedMaybeException
|
||||||
from ._repl import PdbREPL
|
from ._repl import PdbREPL
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__package__)
|
||||||
|
|
||||||
_pause_msg: str = 'Opening a pdb REPL in paused actor'
|
_pause_msg: str = 'Opening a pdb REPL in paused actor'
|
||||||
_repl_fail_msg: str|None = (
|
_repl_fail_msg: str|None = (
|
||||||
|
|
@ -631,7 +631,7 @@ def _set_trace(
|
||||||
log.pdb(
|
log.pdb(
|
||||||
f'{_pause_msg}\n'
|
f'{_pause_msg}\n'
|
||||||
f'>(\n'
|
f'>(\n'
|
||||||
f'|_{actor.aid.uid}\n'
|
f'|_{actor.uid}\n'
|
||||||
f' |_{task}\n' # @ {actor.uid}\n'
|
f' |_{task}\n' # @ {actor.uid}\n'
|
||||||
# f'|_{task}\n'
|
# f'|_{task}\n'
|
||||||
# ^-TODO-^ more compact pformating?
|
# ^-TODO-^ more compact pformating?
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ if TYPE_CHECKING:
|
||||||
BoxedMaybeException,
|
BoxedMaybeException,
|
||||||
)
|
)
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class LockStatus(
|
class LockStatus(
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ if TYPE_CHECKING:
|
||||||
from ._transport import MsgTransport
|
from ._transport import MsgTransport
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
_is_windows = platform.system() == 'Windows'
|
_is_windows = platform.system() == 'Windows'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ if TYPE_CHECKING:
|
||||||
from .._supervise import ActorNursery
|
from .._supervise import ActorNursery
|
||||||
|
|
||||||
|
|
||||||
log = log.get_logger()
|
log = log.get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
async def maybe_wait_on_canced_subs(
|
async def maybe_wait_on_canced_subs(
|
||||||
|
|
|
||||||
|
|
@ -59,7 +59,7 @@ except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
SharedMemory = disable_mantracker()
|
SharedMemory = disable_mantracker()
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ from tractor.ipc._transport import (
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class TCPAddress(
|
class TCPAddress(
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ from tractor.msg import (
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from tractor._addr import Address
|
from tractor._addr import Address
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
# (codec, transport)
|
# (codec, transport)
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ if TYPE_CHECKING:
|
||||||
from ._runtime import Actor
|
from ._runtime import Actor
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
def unwrap_sockpath(
|
def unwrap_sockpath(
|
||||||
|
|
@ -166,10 +166,6 @@ class UDSAddress(
|
||||||
)
|
)
|
||||||
if actor:
|
if actor:
|
||||||
sockname: str = '::'.join(actor.uid) + f'@{pid}'
|
sockname: str = '::'.join(actor.uid) + f'@{pid}'
|
||||||
# ?^TODO, for `multiaddr`'s parser we can't use the `::`
|
|
||||||
# above^, SO maybe a `.` or something else here?
|
|
||||||
# sockname: str = '.'.join(actor.uid) + f'@{pid}'
|
|
||||||
# -[ ] CURRETLY using `.` BREAKS TEST SUITE tho..
|
|
||||||
else:
|
else:
|
||||||
prefix: str = '<unknown-actor>'
|
prefix: str = '<unknown-actor>'
|
||||||
if is_root_process():
|
if is_root_process():
|
||||||
|
|
|
||||||
241
tractor/log.py
241
tractor/log.py
|
|
@ -25,7 +25,6 @@ built on `tractor`.
|
||||||
|
|
||||||
'''
|
'''
|
||||||
from collections.abc import Mapping
|
from collections.abc import Mapping
|
||||||
from functools import partial
|
|
||||||
from inspect import (
|
from inspect import (
|
||||||
FrameInfo,
|
FrameInfo,
|
||||||
getmodule,
|
getmodule,
|
||||||
|
|
@ -47,6 +46,7 @@ import trio
|
||||||
from ._state import current_actor
|
from ._state import current_actor
|
||||||
|
|
||||||
|
|
||||||
|
_proj_name: str = 'tractor'
|
||||||
_default_loglevel: str = 'ERROR'
|
_default_loglevel: str = 'ERROR'
|
||||||
|
|
||||||
# Super sexy formatting thanks to ``colorlog``.
|
# Super sexy formatting thanks to ``colorlog``.
|
||||||
|
|
@ -124,16 +124,6 @@ class StackLevelAdapter(LoggerAdapter):
|
||||||
A (software) stack oriented logger "adapter".
|
A (software) stack oriented logger "adapter".
|
||||||
|
|
||||||
'''
|
'''
|
||||||
@property
|
|
||||||
def level(self) -> str:
|
|
||||||
'''
|
|
||||||
The currently set `str` emit level (in lowercase).
|
|
||||||
|
|
||||||
'''
|
|
||||||
return logging.getLevelName(
|
|
||||||
self.getEffectiveLevel()
|
|
||||||
).lower()
|
|
||||||
|
|
||||||
def at_least_level(
|
def at_least_level(
|
||||||
self,
|
self,
|
||||||
level: str,
|
level: str,
|
||||||
|
|
@ -281,14 +271,9 @@ def pformat_task_uid(
|
||||||
return f'{task.name}[{tid_part}]'
|
return f'{task.name}[{tid_part}]'
|
||||||
|
|
||||||
|
|
||||||
_curr_actor_no_exc = partial(
|
|
||||||
current_actor,
|
|
||||||
err_on_no_runtime=False,
|
|
||||||
)
|
|
||||||
|
|
||||||
_conc_name_getters = {
|
_conc_name_getters = {
|
||||||
'task': pformat_task_uid,
|
'task': pformat_task_uid,
|
||||||
'actor': lambda: _curr_actor_no_exc(),
|
'actor': lambda: current_actor(),
|
||||||
'actor_name': lambda: current_actor().name,
|
'actor_name': lambda: current_actor().name,
|
||||||
'actor_uid': lambda: current_actor().uid[1][:6],
|
'actor_uid': lambda: current_actor().uid[1][:6],
|
||||||
}
|
}
|
||||||
|
|
@ -320,13 +305,8 @@ class ActorContextInfo(Mapping):
|
||||||
return f'no {key} context'
|
return f'no {key} context'
|
||||||
|
|
||||||
|
|
||||||
_proj_name: str = 'tractor'
|
|
||||||
|
|
||||||
|
|
||||||
def get_logger(
|
def get_logger(
|
||||||
name: str|None = None,
|
name: str|None = None,
|
||||||
# ^NOTE, setting `name=_proj_name=='tractor'` enables the "root
|
|
||||||
# logger" for `tractor` itself.
|
|
||||||
pkg_name: str = _proj_name,
|
pkg_name: str = _proj_name,
|
||||||
# XXX, deprecated, use ^
|
# XXX, deprecated, use ^
|
||||||
_root_name: str|None = None,
|
_root_name: str|None = None,
|
||||||
|
|
@ -339,7 +319,6 @@ def get_logger(
|
||||||
# |_https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema
|
# |_https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema
|
||||||
subsys_spec: str|None = None,
|
subsys_spec: str|None = None,
|
||||||
mk_sublog: bool = True,
|
mk_sublog: bool = True,
|
||||||
_strict_debug: bool = False,
|
|
||||||
|
|
||||||
) -> StackLevelAdapter:
|
) -> StackLevelAdapter:
|
||||||
'''
|
'''
|
||||||
|
|
@ -369,101 +348,60 @@ def get_logger(
|
||||||
DeprecationWarning,
|
DeprecationWarning,
|
||||||
stacklevel=2,
|
stacklevel=2,
|
||||||
)
|
)
|
||||||
|
pkg_name: str = _root_name or pkg_name
|
||||||
|
log: Logger
|
||||||
|
log = rlog = logger or logging.getLogger(pkg_name)
|
||||||
|
|
||||||
pkg_name: str = _root_name
|
|
||||||
|
|
||||||
def get_caller_mod(
|
|
||||||
frames_up:int = 2
|
|
||||||
):
|
|
||||||
'''
|
|
||||||
Attempt to get the module which called `tractor.get_logger()`.
|
|
||||||
|
|
||||||
'''
|
|
||||||
callstack: list[FrameInfo] = stack()
|
|
||||||
caller_fi: FrameInfo = callstack[frames_up]
|
|
||||||
caller_mod: ModuleType = getmodule(caller_fi.frame)
|
|
||||||
return caller_mod
|
|
||||||
|
|
||||||
# --- Auto--naming-CASE ---
|
|
||||||
# -------------------------
|
|
||||||
# Implicitly introspect the caller's module-name whenever `name`
|
# Implicitly introspect the caller's module-name whenever `name`
|
||||||
# if left as the null default.
|
# if left as the null default.
|
||||||
#
|
#
|
||||||
# When the `pkg_name` is `in` in the `mod.__name__` we presume
|
# When the `pkg_name` is `in` in the `mod.__name__` we presume
|
||||||
# this instance can be created as a sub-`StackLevelAdapter` and
|
# this instance can be created as a sub-`StackLevelAdapter` and
|
||||||
# that the intention is to get free module-path tracing and
|
# that the intention is get free module-path tracing and
|
||||||
# filtering (well once we implement that) oriented around the
|
# filtering (well once we implement that) oriented around the
|
||||||
# py-module code hierarchy of the consuming project.
|
# py-module code hierarchy of the consuming project.
|
||||||
#
|
|
||||||
if (
|
if (
|
||||||
mk_sublog
|
pkg_name != _proj_name
|
||||||
and
|
and
|
||||||
name is None
|
name is None
|
||||||
and
|
and
|
||||||
pkg_name
|
mk_sublog
|
||||||
):
|
):
|
||||||
if (caller_mod := get_caller_mod()):
|
callstack: list[FrameInfo] = stack()
|
||||||
# ?XXX how is this `caller_mod.__name__` defined?
|
caller_fi: FrameInfo = callstack[1]
|
||||||
# => well by how the mod is imported.. XD
|
caller_mod: ModuleType = getmodule(caller_fi.frame)
|
||||||
|
if caller_mod:
|
||||||
|
# ?how is this `mod.__name__` defined?
|
||||||
|
# -> well by how the mod is imported..
|
||||||
# |_https://stackoverflow.com/a/15883682
|
# |_https://stackoverflow.com/a/15883682
|
||||||
#
|
mod_name: str = caller_mod.__name__
|
||||||
|
mod_pkg: str = caller_mod.__package__
|
||||||
|
log.info(
|
||||||
|
f'Generating sub-logger name,\n'
|
||||||
|
f'{mod_pkg}.{mod_name}\n'
|
||||||
|
)
|
||||||
# if pkg_name in caller_mod.__package__:
|
# if pkg_name in caller_mod.__package__:
|
||||||
# from tractor.devx.debug import mk_pdb
|
# from tractor.devx.debug import mk_pdb
|
||||||
# mk_pdb().set_trace()
|
# mk_pdb().set_trace()
|
||||||
|
|
||||||
mod_ns_path: str = caller_mod.__name__
|
|
||||||
mod_pkg_ns_path: str = caller_mod.__package__
|
|
||||||
# if 'snakelib' in mod_pkg_ns_path:
|
|
||||||
# import pdbp
|
|
||||||
# breakpoint()
|
|
||||||
if (
|
if (
|
||||||
mod_pkg_ns_path in mod_ns_path
|
|
||||||
or
|
|
||||||
pkg_name in mod_ns_path
|
|
||||||
):
|
|
||||||
# proper_mod_name = mod_ns_path.lstrip(
|
|
||||||
proper_mod_name = mod_pkg_ns_path.removeprefix(
|
|
||||||
f'{pkg_name}.'
|
|
||||||
)
|
|
||||||
name = proper_mod_name
|
|
||||||
|
|
||||||
elif (
|
|
||||||
pkg_name
|
pkg_name
|
||||||
# and
|
# and
|
||||||
# pkg_name in mod_ns_path
|
# pkg_name in mod_name
|
||||||
):
|
):
|
||||||
name = mod_ns_path
|
name = mod_name
|
||||||
|
|
||||||
if _strict_debug:
|
|
||||||
msg: str = (
|
|
||||||
f'@ {get_caller_mod()}\n'
|
|
||||||
f'Generating sub-logger name,\n'
|
|
||||||
f'{pkg_name}.{name}\n'
|
|
||||||
)
|
|
||||||
if _curr_actor_no_exc():
|
|
||||||
_root_log.debug(msg)
|
|
||||||
elif pkg_name != _proj_name:
|
|
||||||
print(
|
|
||||||
f'=> tractor.log.get_logger():\n'
|
|
||||||
f'{msg}\n'
|
|
||||||
)
|
|
||||||
|
|
||||||
# build a root logger instance
|
|
||||||
log: Logger
|
|
||||||
rlog = log = (
|
|
||||||
logger
|
|
||||||
or
|
|
||||||
logging.getLogger(pkg_name)
|
|
||||||
)
|
|
||||||
|
|
||||||
# XXX, lowlevel debuggin..
|
# XXX, lowlevel debuggin..
|
||||||
# if pkg_name != _proj_name:
|
# if pkg_name != _proj_name:
|
||||||
# from tractor.devx.debug import mk_pdb
|
# from tractor.devx.debug import mk_pdb
|
||||||
# mk_pdb().set_trace()
|
# mk_pdb().set_trace()
|
||||||
|
|
||||||
# NOTE: for handling for modules that use the unecessary,
|
if (
|
||||||
# `get_logger(__name__)`
|
name != _proj_name
|
||||||
#
|
and
|
||||||
|
name
|
||||||
|
):
|
||||||
|
# NOTE: for handling for modules that use `get_logger(__name__)`
|
||||||
# we make the following stylistic choice:
|
# we make the following stylistic choice:
|
||||||
# - always avoid duplicate project-package token
|
# - always avoid duplicate project-package token
|
||||||
# in msg output: i.e. tractor.tractor.ipc._chan.py in header
|
# in msg output: i.e. tractor.tractor.ipc._chan.py in header
|
||||||
|
|
@ -471,67 +409,18 @@ def get_logger(
|
||||||
# - never show the leaf module name in the {name} part
|
# - never show the leaf module name in the {name} part
|
||||||
# since in python the {filename} is always this same
|
# since in python the {filename} is always this same
|
||||||
# module-file.
|
# module-file.
|
||||||
if (
|
|
||||||
name
|
|
||||||
and
|
|
||||||
# ?TODO? more correct?
|
|
||||||
# _proj_name not in name
|
|
||||||
name != pkg_name
|
|
||||||
):
|
|
||||||
# ex. modden.runtime.progman
|
|
||||||
# -> rname='modden', _, pkg_path='runtime.progman'
|
|
||||||
if (
|
|
||||||
pkg_name
|
|
||||||
and
|
|
||||||
pkg_name in name
|
|
||||||
):
|
|
||||||
proper_name: str = name.removeprefix(
|
|
||||||
f'{pkg_name}.'
|
|
||||||
)
|
|
||||||
# if 'pylib' in name:
|
|
||||||
# import pdbp
|
|
||||||
# breakpoint()
|
|
||||||
|
|
||||||
msg: str = (
|
|
||||||
f'@ {get_caller_mod()}\n'
|
|
||||||
f'Duplicate pkg-name in sub-logger `name`-key?\n'
|
|
||||||
f'pkg_name = {pkg_name!r}\n'
|
|
||||||
f'name = {name!r}\n'
|
|
||||||
f'\n'
|
|
||||||
f'=> You should change your input params to,\n'
|
|
||||||
f'get_logger(\n'
|
|
||||||
f' pkg_name={pkg_name!r}\n'
|
|
||||||
f' name={proper_name!r}\n'
|
|
||||||
f')'
|
|
||||||
)
|
|
||||||
# assert _duplicate == rname
|
|
||||||
if _curr_actor_no_exc():
|
|
||||||
_root_log.warning(msg)
|
|
||||||
else:
|
|
||||||
print(
|
|
||||||
f'=> tractor.log.get_logger() ERROR:\n'
|
|
||||||
f'{msg}\n'
|
|
||||||
)
|
|
||||||
|
|
||||||
name = proper_name
|
|
||||||
|
|
||||||
rname: str = pkg_name
|
rname: str = pkg_name
|
||||||
pkg_path: str = name
|
pkg_path: str = name
|
||||||
|
|
||||||
|
# ex. modden.runtime.progman
|
||||||
|
# -> rname='modden', _, pkg_path='runtime.progman'
|
||||||
|
if pkg_name in name:
|
||||||
|
rname, _, pkg_path = name.partition('.')
|
||||||
|
|
||||||
# (
|
# ex. modden.runtime.progman
|
||||||
# rname,
|
|
||||||
# _,
|
|
||||||
# pkg_path,
|
|
||||||
# ) = name.partition('.')
|
|
||||||
|
|
||||||
# For ex. 'modden.runtime.progman'
|
|
||||||
# -> pkgpath='runtime', _, leaf_mod='progman'
|
# -> pkgpath='runtime', _, leaf_mod='progman'
|
||||||
(
|
subpkg_path, _, leaf_mod = pkg_path.rpartition('.')
|
||||||
subpkg_path,
|
|
||||||
_,
|
|
||||||
leaf_mod,
|
|
||||||
) = pkg_path.rpartition('.')
|
|
||||||
|
|
||||||
# NOTE: special usage for passing `name=__name__`,
|
# NOTE: special usage for passing `name=__name__`,
|
||||||
#
|
#
|
||||||
|
|
@ -547,84 +436,36 @@ def get_logger(
|
||||||
# only includes the first 2 sub-pkg name-tokens in the
|
# only includes the first 2 sub-pkg name-tokens in the
|
||||||
# child-logger's name; the colored "pkg-namespace" header
|
# child-logger's name; the colored "pkg-namespace" header
|
||||||
# will then correctly show the same value as `name`.
|
# will then correctly show the same value as `name`.
|
||||||
if (
|
if rname == pkg_name:
|
||||||
# XXX, TRY to remove duplication cases
|
|
||||||
# which get warn-logged on below!
|
|
||||||
(
|
|
||||||
# when, subpkg_path == pkg_path
|
|
||||||
subpkg_path
|
|
||||||
and
|
|
||||||
rname == pkg_name
|
|
||||||
)
|
|
||||||
# ) or (
|
|
||||||
# # when, pkg_path == leaf_mod
|
|
||||||
# pkg_path
|
|
||||||
# and
|
|
||||||
# leaf_mod == pkg_path
|
|
||||||
# )
|
|
||||||
):
|
|
||||||
pkg_path = subpkg_path
|
pkg_path = subpkg_path
|
||||||
|
|
||||||
# XXX, do some double-checks for duplication of,
|
# XXX, do some double-checks for duplication of,
|
||||||
# - root-pkg-name, already in root logger
|
# - root-pkg-name, already in root logger
|
||||||
# - leaf-module-name already in `{filename}` header-field
|
# - leaf-module-name already in `{filename}` header-field
|
||||||
if (
|
if pkg_name in pkg_path:
|
||||||
_strict_debug
|
|
||||||
and
|
|
||||||
pkg_name
|
|
||||||
and
|
|
||||||
pkg_name in pkg_path
|
|
||||||
):
|
|
||||||
_duplicate, _, pkg_path = pkg_path.partition('.')
|
_duplicate, _, pkg_path = pkg_path.partition('.')
|
||||||
if _duplicate:
|
if _duplicate:
|
||||||
msg: str = (
|
# assert _duplicate == rname
|
||||||
f'@ {get_caller_mod()}\n'
|
_root_log.warning(
|
||||||
f'Duplicate pkg-name in sub-logger key?\n'
|
f'Duplicate pkg-name in sub-logger key?\n'
|
||||||
f'pkg_name = {pkg_name!r}\n'
|
f'pkg_name = {pkg_name!r}\n'
|
||||||
f'pkg_path = {pkg_path!r}\n'
|
f'pkg_path = {pkg_path!r}\n'
|
||||||
)
|
)
|
||||||
# assert _duplicate == rname
|
|
||||||
if _curr_actor_no_exc():
|
|
||||||
_root_log.warning(msg)
|
|
||||||
else:
|
|
||||||
print(
|
|
||||||
f'=> tractor.log.get_logger() ERROR:\n'
|
|
||||||
f'{msg}\n'
|
|
||||||
)
|
|
||||||
# XXX, should never get here?
|
|
||||||
breakpoint()
|
|
||||||
if (
|
if (
|
||||||
_strict_debug
|
|
||||||
and
|
|
||||||
leaf_mod
|
leaf_mod
|
||||||
and
|
and
|
||||||
leaf_mod in pkg_path
|
leaf_mod in pkg_path
|
||||||
):
|
):
|
||||||
msg: str = (
|
_root_log.warning(
|
||||||
f'@ {get_caller_mod()}\n'
|
|
||||||
f'Duplicate leaf-module-name in sub-logger key?\n'
|
f'Duplicate leaf-module-name in sub-logger key?\n'
|
||||||
f'leaf_mod = {leaf_mod!r}\n'
|
f'leaf_mod = {leaf_mod!r}\n'
|
||||||
f'pkg_path = {pkg_path!r}\n'
|
f'pkg_path = {pkg_path!r}\n'
|
||||||
)
|
)
|
||||||
if _curr_actor_no_exc():
|
|
||||||
_root_log.warning(msg)
|
|
||||||
else:
|
|
||||||
print(
|
|
||||||
f'=> tractor.log.get_logger() ERROR:\n'
|
|
||||||
f'{msg}\n'
|
|
||||||
)
|
|
||||||
|
|
||||||
# mk/get underlying (sub-)`Logger`
|
if not pkg_path:
|
||||||
if (
|
|
||||||
not pkg_path
|
|
||||||
and
|
|
||||||
leaf_mod == pkg_name
|
|
||||||
):
|
|
||||||
# breakpoint()
|
|
||||||
log = rlog
|
log = rlog
|
||||||
|
|
||||||
elif mk_sublog:
|
elif mk_sublog:
|
||||||
# breakpoint()
|
|
||||||
log = rlog.getChild(pkg_path)
|
log = rlog.getChild(pkg_path)
|
||||||
|
|
||||||
log.level = rlog.level
|
log.level = rlog.level
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ from tractor.log import get_logger
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from tractor._context import Context
|
from tractor._context import Context
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
# TODO: unify with `MsgCodec` by making `._dec` part this?
|
# TODO: unify with `MsgCodec` by making `._dec` part this?
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ if TYPE_CHECKING:
|
||||||
from tractor._streaming import MsgStream
|
from tractor._streaming import MsgStream
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
_def_any_pldec: MsgDec[Any] = mk_dec(spec=Any)
|
_def_any_pldec: MsgDec[Any] = mk_dec(spec=Any)
|
||||||
|
|
|
||||||
|
|
@ -126,17 +126,13 @@ def iter_struct_ppfmt_lines(
|
||||||
str(ft)
|
str(ft)
|
||||||
).replace(' ', '')
|
).replace(' ', '')
|
||||||
|
|
||||||
if k[0] == '_':
|
|
||||||
continue
|
|
||||||
|
|
||||||
# recurse to get sub-struct's `.pformat()` output Bo
|
# recurse to get sub-struct's `.pformat()` output Bo
|
||||||
elif isinstance(v, Struct):
|
if isinstance(v, Struct):
|
||||||
yield from iter_struct_ppfmt_lines(
|
yield from iter_struct_ppfmt_lines(
|
||||||
struct=v,
|
struct=v,
|
||||||
field_indent=field_indent+field_indent,
|
field_indent=field_indent+field_indent,
|
||||||
)
|
)
|
||||||
|
else:
|
||||||
else: # top-level field
|
|
||||||
val_str: str = repr(v)
|
val_str: str = repr(v)
|
||||||
|
|
||||||
# XXX LOL, below just seems to be f#$%in causing
|
# XXX LOL, below just seems to be f#$%in causing
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ from tractor.log import get_logger
|
||||||
# from tractor._addr import UnwrappedAddress
|
# from tractor._addr import UnwrappedAddress
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger('tractor.msgspec')
|
||||||
|
|
||||||
# type variable for the boxed payload field `.pld`
|
# type variable for the boxed payload field `.pld`
|
||||||
PayloadT = TypeVar('PayloadT')
|
PayloadT = TypeVar('PayloadT')
|
||||||
|
|
@ -202,10 +202,7 @@ class SpawnSpec(
|
||||||
# TODO: similar to the `Start` kwargs spec needed below, we need
|
# TODO: similar to the `Start` kwargs spec needed below, we need
|
||||||
# a hard `Struct` def for all of these fields!
|
# a hard `Struct` def for all of these fields!
|
||||||
_parent_main_data: dict
|
_parent_main_data: dict
|
||||||
_runtime_vars: (
|
_runtime_vars: dict[str, Any]
|
||||||
dict[str, Any]
|
|
||||||
#|RuntimeVars # !TODO
|
|
||||||
)
|
|
||||||
# ^NOTE see `._state._runtime_vars: dict`
|
# ^NOTE see `._state._runtime_vars: dict`
|
||||||
|
|
||||||
# module import capability
|
# module import capability
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ from trio.lowlevel import current_task
|
||||||
from msgspec import Struct
|
from msgspec import Struct
|
||||||
from tractor.log import get_logger
|
from tractor.log import get_logger
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
# TODO: use new type-vars syntax from 3.12
|
# TODO: use new type-vars syntax from 3.12
|
||||||
# https://realpython.com/python312-new-features/#dedicated-type-variable-syntax
|
# https://realpython.com/python312-new-features/#dedicated-type-variable-syntax
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ if TYPE_CHECKING:
|
||||||
from tractor import ActorNursery
|
from tractor import ActorNursery
|
||||||
|
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
# A regular invariant generic type
|
# A regular invariant generic type
|
||||||
T = TypeVar("T")
|
T = TypeVar("T")
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ from typing import (
|
||||||
import trio
|
import trio
|
||||||
from tractor.log import get_logger
|
from tractor.log import get_logger
|
||||||
|
|
||||||
log = get_logger()
|
log = get_logger(__name__)
|
||||||
|
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|
@ -246,12 +246,23 @@ async def maybe_raise_from_masking_exc(
|
||||||
type(exc_match) # masked type
|
type(exc_match) # masked type
|
||||||
)
|
)
|
||||||
|
|
||||||
# Add to masked `exc_ctx`
|
|
||||||
if do_warn:
|
if do_warn:
|
||||||
exc_ctx.add_note(note)
|
exc_ctx.add_note(note)
|
||||||
|
|
||||||
# don't unmask already known "special" cases..
|
if (
|
||||||
|
do_warn
|
||||||
|
and
|
||||||
|
type(exc_match) in always_warn_on
|
||||||
|
):
|
||||||
|
log.warning(note)
|
||||||
|
|
||||||
|
if (
|
||||||
|
do_warn
|
||||||
|
and
|
||||||
|
raise_unmasked
|
||||||
|
):
|
||||||
if len(masked) < 2:
|
if len(masked) < 2:
|
||||||
|
# don't unmask already known "special" cases..
|
||||||
if (
|
if (
|
||||||
_mask_cases
|
_mask_cases
|
||||||
and
|
and
|
||||||
|
|
@ -272,26 +283,11 @@ async def maybe_raise_from_masking_exc(
|
||||||
)
|
)
|
||||||
raise exc_match
|
raise exc_match
|
||||||
|
|
||||||
# ^?TODO, see above but, possibly unmasking sub-exc
|
raise exc_ctx from exc_match
|
||||||
|
|
||||||
|
# ??TODO, see above but, possibly unmasking sub-exc
|
||||||
# entries if there are > 1
|
# entries if there are > 1
|
||||||
# else:
|
# else:
|
||||||
# await pause(shield=True)
|
# await pause(shield=True)
|
||||||
|
|
||||||
if type(exc_match) in always_warn_on:
|
|
||||||
import traceback
|
|
||||||
trace: list[str] = traceback.format_exception(
|
|
||||||
type(exc_ctx),
|
|
||||||
exc_ctx,
|
|
||||||
exc_ctx.__traceback__
|
|
||||||
)
|
|
||||||
tb_str: str = ''.join(trace)
|
|
||||||
log.warning(tb_str)
|
|
||||||
# XXX, for debug
|
|
||||||
# from tractor import pause
|
|
||||||
# await pause(shield=True)
|
|
||||||
|
|
||||||
if raise_unmasked:
|
|
||||||
raise exc_ctx from exc_match
|
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise
|
raise
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue