diff --git a/piker/brokers/ib/_util.py b/piker/brokers/ib/_util.py index 5ecd4e55..690f6c22 100644 --- a/piker/brokers/ib/_util.py +++ b/piker/brokers/ib/_util.py @@ -40,7 +40,7 @@ if TYPE_CHECKING: from .api import Client import i3ipc -log = get_logger('piker.brokers.ib') +log = get_logger(name=__name__) _reset_tech: Literal[ 'vnc', diff --git a/piker/brokers/ib/broker.py b/piker/brokers/ib/broker.py index 1e9d9c1b..f6f7d123 100644 --- a/piker/brokers/ib/broker.py +++ b/piker/brokers/ib/broker.py @@ -50,6 +50,7 @@ from ib_insync.objects import ( ) from piker import config +from piker.log import get_logger from piker.types import Struct from piker.accounting import ( Position, @@ -77,7 +78,6 @@ from piker.clearing._messages import ( BrokerdFill, BrokerdError, ) -from ._util import log from .api import ( _accounts2clients, get_config, @@ -95,6 +95,8 @@ from .ledger import ( update_ledger_from_api_trades, ) +log = get_logger(name=__name__) + def pack_position( pos: IbPosition, diff --git a/piker/brokers/ib/feed.py b/piker/brokers/ib/feed.py index 28054da4..6cb46ce6 100644 --- a/piker/brokers/ib/feed.py +++ b/piker/brokers/ib/feed.py @@ -56,11 +56,11 @@ from piker.brokers._util import ( NoData, DataUnavailable, ) +from piker.log import get_logger from .api import ( # _adhoc_futes_set, Client, con2fqme, - log, load_aio_clients, MethodProxy, open_client_proxies, @@ -78,6 +78,9 @@ from .symbols import get_mkt_info if TYPE_CHECKING: from trio._core._run import Task +log = get_logger( + name=__name__, +) # XXX NOTE: See available types table docs: # https://interactivebrokers.github.io/tws-api/tick_types.html diff --git a/piker/brokers/ib/ledger.py b/piker/brokers/ib/ledger.py index d62b4ba7..dc23748d 100644 --- a/piker/brokers/ib/ledger.py +++ b/piker/brokers/ib/ledger.py @@ -44,6 +44,7 @@ from ib_insync import ( CommissionReport, ) +from piker.log import get_logger from piker.types import Struct from piker.data import ( SymbologyCache, @@ -57,7 +58,6 @@ from piker.accounting import ( iter_by_dt, ) from ._flex_reports import parse_flex_dt -from ._util import log if TYPE_CHECKING: from .api import ( @@ -65,6 +65,9 @@ if TYPE_CHECKING: MethodProxy, ) +log = get_logger( + name=__name__, +) tx_sort: Callable = partial( iter_by_dt, diff --git a/piker/brokers/ib/symbols.py b/piker/brokers/ib/symbols.py index 04ec74e4..6e208fe6 100644 --- a/piker/brokers/ib/symbols.py +++ b/piker/brokers/ib/symbols.py @@ -42,10 +42,7 @@ from piker.accounting import ( from piker._cacheables import ( async_lifo_cache, ) - -from ._util import ( - log, -) +from piker.log import get_logger if TYPE_CHECKING: from .api import ( @@ -53,6 +50,10 @@ if TYPE_CHECKING: Client, ) +log = get_logger( + name=__name__, +) + _futes_venues = ( 'GLOBEX', 'NYMEX', diff --git a/piker/cli/__init__.py b/piker/cli/__init__.py index 46c5da70..5a4d3c99 100644 --- a/piker/cli/__init__.py +++ b/piker/cli/__init__.py @@ -326,7 +326,7 @@ def services( loglevel=( config['loglevel'] if tl - else None, + else None ), ), tractor.get_registry(