Compare commits
5 Commits
e0ec09cf19
...
f96d3c407e
| Author | SHA1 | Date |
|---|---|---|
|
|
f96d3c407e | |
|
|
2012543744 | |
|
|
3fdfe54cdc | |
|
|
808405fc4c | |
|
|
7ff1fa5369 |
|
|
@ -277,7 +277,11 @@ async def open_history_client(
|
|||
|
||||
if end_dt is None:
|
||||
inow: int = round(time.time())
|
||||
if (inow - times[-1]) > 60:
|
||||
if (
|
||||
(inow - times[-1])
|
||||
>
|
||||
timeframe
|
||||
):
|
||||
await tractor.pause()
|
||||
|
||||
start_dt = from_timestamp(times[0])
|
||||
|
|
|
|||
|
|
@ -488,7 +488,6 @@ def con2fqme(
|
|||
@async_lifo_cache()
|
||||
async def get_mkt_info(
|
||||
fqme: str,
|
||||
|
||||
proxy: MethodProxy|None = None,
|
||||
|
||||
) -> tuple[MktPair, ibis.ContractDetails]:
|
||||
|
|
@ -550,7 +549,7 @@ async def get_mkt_info(
|
|||
size_tick: Decimal = Decimal(
|
||||
str(details.minSize).rstrip('0')
|
||||
)
|
||||
# |-> TODO: there is also the Contract.sizeIncrement, bt wtf is it?
|
||||
# ?TODO, there is also the Contract.sizeIncrement, bt wtf is it?
|
||||
|
||||
# NOTE: this is duplicate from the .broker.norm_trade_records()
|
||||
# routine, we should factor all this parsing somewhere..
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ from tractor import trionics
|
|||
from ._util import (
|
||||
log, # sub-sys logger
|
||||
get_console_log,
|
||||
subsys,
|
||||
)
|
||||
from ..accounting._mktinfo import (
|
||||
unpack_fqme,
|
||||
|
|
@ -766,7 +767,11 @@ async def _setup_persistent_emsd(
|
|||
) -> None:
|
||||
|
||||
if loglevel:
|
||||
get_console_log(loglevel)
|
||||
_log = get_console_log(
|
||||
level=loglevel,
|
||||
name=subsys,
|
||||
)
|
||||
assert _log.name == 'piker.clearing'
|
||||
|
||||
global _router
|
||||
|
||||
|
|
|
|||
|
|
@ -28,12 +28,14 @@ from ..log import (
|
|||
from piker.types import Struct
|
||||
subsys: str = 'piker.clearing'
|
||||
|
||||
log = get_logger(subsys)
|
||||
log = get_logger(
|
||||
name='piker.clearing',
|
||||
)
|
||||
|
||||
# TODO, oof doesn't this ignore the `loglevel` then???
|
||||
get_console_log = partial(
|
||||
get_console_log,
|
||||
name=subsys,
|
||||
name='clearing',
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -136,7 +136,10 @@ def pikerd(
|
|||
'''
|
||||
# from tractor.devx import maybe_open_crash_handler
|
||||
# with maybe_open_crash_handler(pdb=False):
|
||||
log = get_console_log(loglevel, name='cli')
|
||||
log = get_console_log(
|
||||
level=loglevel,
|
||||
with_tractor_log=tl,
|
||||
)
|
||||
|
||||
if pdb:
|
||||
log.warning((
|
||||
|
|
@ -295,7 +298,11 @@ def cli(
|
|||
@click.option('--tl', is_flag=True, help='Enable tractor logging')
|
||||
@click.argument('ports', nargs=-1, required=False)
|
||||
@click.pass_obj
|
||||
def services(config, tl, ports):
|
||||
def services(
|
||||
config,
|
||||
tl: bool,
|
||||
ports,
|
||||
):
|
||||
|
||||
from ..service import (
|
||||
open_piker_runtime,
|
||||
|
|
@ -316,7 +323,11 @@ def services(config, tl, ports):
|
|||
async with (
|
||||
open_piker_runtime(
|
||||
name='service_query',
|
||||
loglevel=config['loglevel'] if tl else None,
|
||||
loglevel=(
|
||||
config['loglevel']
|
||||
if tl
|
||||
else None,
|
||||
),
|
||||
),
|
||||
tractor.get_registry(
|
||||
addr=addr,
|
||||
|
|
|
|||
|
|
@ -26,7 +26,9 @@ from ..log import (
|
|||
)
|
||||
subsys: str = 'piker.data'
|
||||
|
||||
log = get_logger(subsys)
|
||||
log = get_logger(
|
||||
name=subsys,
|
||||
)
|
||||
|
||||
get_console_log = partial(
|
||||
get_console_log,
|
||||
|
|
|
|||
67
piker/log.py
67
piker/log.py
|
|
@ -37,35 +37,84 @@ _proj_name: str = 'piker'
|
|||
|
||||
|
||||
def get_logger(
|
||||
name: str = None,
|
||||
|
||||
name: str|None = None,
|
||||
**tractor_log_kwargs,
|
||||
) -> logging.Logger:
|
||||
'''
|
||||
Return the package log or a sub-log for `name` if provided.
|
||||
Return the package log or a sub-logger if a `name=` is provided,
|
||||
which defaults to the calling module's pkg-namespace path.
|
||||
|
||||
See `tractor.log.get_logger()` for details.
|
||||
|
||||
'''
|
||||
pkg_name: str = _proj_name
|
||||
if (
|
||||
name
|
||||
and
|
||||
pkg_name in name
|
||||
):
|
||||
name: str = name.lstrip(f'{_proj_name}.')
|
||||
|
||||
return tractor.log.get_logger(
|
||||
name=name,
|
||||
_root_name=_proj_name,
|
||||
pkg_name=pkg_name,
|
||||
**tractor_log_kwargs,
|
||||
)
|
||||
|
||||
|
||||
def get_console_log(
|
||||
level: str|None = None,
|
||||
name: str|None = None,
|
||||
pkg_name: str|None = None,
|
||||
with_tractor_log: bool = False,
|
||||
# ?TODO, support a "log-spec" style `str|dict[str, str]` which
|
||||
# dictates both the sublogger-key and a level?
|
||||
# -> see similar idea in `modden`'s usage.
|
||||
**tractor_log_kwargs,
|
||||
|
||||
) -> logging.Logger:
|
||||
'''
|
||||
Get the package logger and enable a handler which writes to stderr.
|
||||
Get the package logger and enable a handler which writes to
|
||||
stderr.
|
||||
|
||||
Yeah yeah, i know we can use ``DictConfig``. You do it...
|
||||
Yeah yeah, i know we can use `DictConfig`.
|
||||
You do it.. Bp
|
||||
|
||||
'''
|
||||
pkg_name: str = _proj_name
|
||||
if (
|
||||
name
|
||||
and
|
||||
pkg_name in name
|
||||
):
|
||||
name: str = name.lstrip(f'{_proj_name}.')
|
||||
|
||||
tll: str|None = None
|
||||
if (
|
||||
with_tractor_log is not False
|
||||
):
|
||||
tll = level
|
||||
|
||||
elif maybe_actor := tractor.current_actor(
|
||||
err_on_no_runtime=False,
|
||||
):
|
||||
tll = maybe_actor.loglevel
|
||||
|
||||
if tll:
|
||||
t_log = tractor.log.get_console_log(
|
||||
level=tll,
|
||||
name='tractor', # <- XXX, force root tractor log!
|
||||
**tractor_log_kwargs,
|
||||
)
|
||||
# TODO/ allow only enabling certain tractor sub-logs?
|
||||
assert t_log.name == 'tractor'
|
||||
|
||||
return tractor.log.get_console_log(
|
||||
level,
|
||||
level=level,
|
||||
name=name,
|
||||
_root_name=_proj_name,
|
||||
) # our root logger
|
||||
pkg_name=pkg_name,
|
||||
**tractor_log_kwargs,
|
||||
)
|
||||
|
||||
|
||||
def colorize_json(
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
from __future__ import annotations
|
||||
import os
|
||||
from typing import (
|
||||
Optional,
|
||||
Any,
|
||||
ClassVar,
|
||||
)
|
||||
|
|
@ -59,7 +58,7 @@ async def open_piker_runtime(
|
|||
registry_addrs: list[tuple[str, int]] = [],
|
||||
|
||||
enable_modules: list[str] = [],
|
||||
loglevel: Optional[str] = None,
|
||||
loglevel: str|None = None,
|
||||
|
||||
# XXX NOTE XXX: you should pretty much never want debug mode
|
||||
# for data daemons when running in production.
|
||||
|
|
@ -163,7 +162,6 @@ _root_modules: list[str] = [
|
|||
@acm
|
||||
async def open_pikerd(
|
||||
registry_addrs: list[tuple[str, int]],
|
||||
|
||||
loglevel: str|None = None,
|
||||
|
||||
# XXX: you should pretty much never want debug mode
|
||||
|
|
@ -192,7 +190,6 @@ async def open_pikerd(
|
|||
|
||||
async with (
|
||||
open_piker_runtime(
|
||||
|
||||
name=_root_dname,
|
||||
loglevel=loglevel,
|
||||
debug_mode=debug_mode,
|
||||
|
|
@ -273,7 +270,9 @@ async def maybe_open_pikerd(
|
|||
|
||||
'''
|
||||
if loglevel:
|
||||
get_console_log(loglevel)
|
||||
get_console_log(
|
||||
level=loglevel
|
||||
)
|
||||
|
||||
# subtle, we must have the runtime up here or portal lookup will fail
|
||||
query_name = kwargs.pop(
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ if TYPE_CHECKING:
|
|||
# from .feed import _FeedsBus
|
||||
|
||||
|
||||
log = get_logger()
|
||||
log = get_logger(__name__)
|
||||
|
||||
|
||||
# `ShmArray` buffer sizing configuration:
|
||||
|
|
|
|||
8
uv.lock
8
uv.lock
|
|
@ -2205,7 +2205,7 @@ dev = [
|
|||
{ name = "pytest", specifier = ">=8.3.5" },
|
||||
{ name = "stackscope", specifier = ">=0.2.2,<0.3" },
|
||||
{ name = "typing-extensions", specifier = ">=4.14.1" },
|
||||
{ name = "xonsh", specifier = ">=0.22.1" },
|
||||
{ name = "xonsh", specifier = ">=0.22.2" },
|
||||
]
|
||||
devx = [
|
||||
{ name = "greenback", specifier = ">=1.2.1,<2" },
|
||||
|
|
@ -2217,7 +2217,7 @@ repl = [
|
|||
{ name = "prompt-toolkit", specifier = ">=3.0.50" },
|
||||
{ name = "psutil", specifier = ">=7.0.0" },
|
||||
{ name = "pyperclip", specifier = ">=1.9.0" },
|
||||
{ name = "xonsh", specifier = ">=0.22.1" },
|
||||
{ name = "xonsh", specifier = ">=0.22.2" },
|
||||
]
|
||||
testing = [
|
||||
{ name = "pexpect", specifier = ">=4.9.0,<5" },
|
||||
|
|
@ -2469,8 +2469,8 @@ wheels = [
|
|||
|
||||
[[package]]
|
||||
name = "xonsh"
|
||||
version = "0.22.1"
|
||||
source = { git = "https://github.com/xonsh/xonsh.git?branch=main#336658ff0919f8d7bb96d581136d37d470a8fe99" }
|
||||
version = "0.22.3"
|
||||
source = { git = "https://github.com/xonsh/xonsh.git?branch=main#b446946fd94c3913e002318db1d1b41ee4fa1f9a" }
|
||||
|
||||
[[package]]
|
||||
name = "yapic-json"
|
||||
|
|
|
|||
Loading…
Reference in New Issue