Apply `Services` runtime state **immediately** inside starup block

service_subpkg
Tyler Goodlet 2023-03-08 13:01:42 -05:00
parent 8c66f066bd
commit 05b67c27d0
1 changed files with 12 additions and 10 deletions

View File

@ -337,7 +337,6 @@ async def open_pikerd(
alive underling services (see below). alive underling services (see below).
''' '''
async with ( async with (
open_piker_runtime( open_piker_runtime(
@ -355,7 +354,13 @@ async def open_pikerd(
tractor.open_nursery() as actor_nursery, tractor.open_nursery() as actor_nursery,
trio.open_nursery() as service_nursery, trio.open_nursery() as service_nursery,
): ):
assert root_actor.accept_addr == reg_addr if root_actor.accept_addr != reg_addr:
raise RuntimeError(f'Daemon failed to bind on {reg_addr}!?')
# assign globally for future daemon/task creation
Services.actor_n = actor_nursery
Services.service_n = service_nursery
Services.debug_mode = debug_mode
if tsdb: if tsdb:
from piker.data._ahab import start_ahab from piker.data._ahab import start_ahab
@ -366,6 +371,7 @@ async def open_pikerd(
start_ahab, start_ahab,
'marketstored', 'marketstored',
start_marketstore, start_marketstore,
loglevel,
) )
log.info( log.info(
@ -385,7 +391,6 @@ async def open_pikerd(
start_ahab, start_ahab,
'elasticsearch', 'elasticsearch',
start_elasticsearch, start_elasticsearch,
start_timeout=240.0 # high cause ci
) )
) )
@ -396,12 +401,6 @@ async def open_pikerd(
f'config: {pformat(config)}' f'config: {pformat(config)}'
) )
# assign globally for future daemon/task creation
Services.actor_n = actor_nursery
Services.service_n = service_nursery
Services.debug_mode = debug_mode
try: try:
yield Services yield Services
@ -695,7 +694,10 @@ async def maybe_spawn_brokerd(
f'brokerd.{brokername}', f'brokerd.{brokername}',
service_task_target=spawn_brokerd, service_task_target=spawn_brokerd,
spawn_args={'brokername': brokername, 'loglevel': loglevel}, spawn_args={
'brokername': brokername,
'loglevel': loglevel,
},
loglevel=loglevel, loglevel=loglevel,
**kwargs, **kwargs,