pikers
/
piker
3
0
Fork 0
Code Issues 2 Pull Requests 4 Packages Projects Releases Wiki Activity

.data._web_bs: add client module name to log msgs

marketstore_disable_snappy
Tyler Goodlet 2023-04-26 11:39:23 -04:00
parent 363a2bbcc6
commit 7a3bce3f33
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
piker/data/_web_bs.py
View File

@ -156,6 +156,8 @@ async def _reconnect_forever(
) -> None: ) -> None:
src_mod: str = fixture.__module__
async def proxy_msgs( async def proxy_msgs(
ws: WebSocketConnection, ws: WebSocketConnection,
pcs: trio.CancelScope, # parent cancel scope pcs: trio.CancelScope, # parent cancel scope
@ -179,6 +181,7 @@ async def _reconnect_forever(
await snd.send(msg) await snd.send(msg)
except nobsws.recon_errors: except nobsws.recon_errors:
log.exception( log.exception(
f'{src_mod}\n'
f'{url} connection bail with:' f'{url} connection bail with:'
) )
await trio.sleep(0.5) await trio.sleep(0.5)
@ -191,7 +194,8 @@ async def _reconnect_forever(
timeouts += 1 timeouts += 1
if timeouts > reset_after: if timeouts > reset_after:
log.error( log.error(
'WS feed seems down and slow af? .. resetting\n' f'{src_mod}\n'
'WS feed seems down and slow af.. reconnecting\n'
) )
pcs.cancel() pcs.cancel()
@ -218,14 +222,20 @@ async def _reconnect_forever(
task_status.started() task_status.started()
while not snd._closed: while not snd._closed:
log.info(f'{url} trying (RE)CONNECT') log.info(
f'{src_mod}\n'
f'{url} trying (RE)CONNECT'
)
async with trio.open_nursery() as n: async with trio.open_nursery() as n:
cs = nobsws._cs = n.cancel_scope cs = nobsws._cs = n.cancel_scope
ws: WebSocketConnection ws: WebSocketConnection
async with open_websocket_url(url) as ws: async with open_websocket_url(url) as ws:
nobsws._ws = ws nobsws._ws = ws
log.info(f'Connection success: {url}') log.info(
f'{src_mod}\n'
f'Connection success: {url}'
)
# begin relay loop to forward msgs # begin relay loop to forward msgs
n.start_soon( n.start_soon(
@ -235,7 +245,10 @@ async def _reconnect_forever(
) )
if fixture is not None: if fixture is not None:
log.info(f'Entering fixture: {fixture}') log.info(
f'{src_mod}\n'
f'Entering fixture: {fixture}'
)
# TODO: should we return an explicit sub-cs # TODO: should we return an explicit sub-cs
# from this fixture task? # from this fixture task?
@ -267,7 +280,10 @@ async def _reconnect_forever(
# -> from here, move to next reconnect attempt # -> from here, move to next reconnect attempt
else: else:
log.exception('ws connection closed by client...') log.exception(
f'{src_mod}\n'
'ws connection closed by client...'
)
@acm @acm