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

Fix portal result `await`, comment some unused code

async_hist_loading
Tyler Goodlet 2022-02-28 07:04:28 -05:00
parent 7a943f0e1e
commit 89a98c4aa2
1 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
piker/_daemon.py
View File

@ -80,7 +80,6 @@ class Services(BaseModel):
) -> Any: ) -> Any:
with trio.CancelScope() as cs: with trio.CancelScope() as cs:
async with portal.open_context( async with portal.open_context(
target, target,
**kwargs, **kwargs,
@ -89,19 +88,17 @@ class Services(BaseModel):
# unblock once the remote context has started # unblock once the remote context has started
task_status.started((cs, first)) task_status.started((cs, first))
log.info(
f'`pikerd` service {name} started with value {first}'
)
# wait on any context's return value # wait on any context's return value
ctx_res = await ctx.result() ctx_res = await ctx.result()
log.info(
f'`pikerd` service {name} started with value {ctx_res}'
)
# wait on any error from the sub-actor # wait on any error from the sub-actor
# NOTE: this will block indefinitely until cancelled # NOTE: this will block indefinitely until cancelled
# either by error from the target context function or # either by error from the target context function or by
# by being cancelled here by the surroundingn cancel # being cancelled here by the surrounding cancel scope
# scope return (await portal.result(), ctx_res)
return await (portal.result(), ctx_res)
cs, first = await self.service_n.start(open_context_in_task) cs, first = await self.service_n.start(open_context_in_task)
@ -111,16 +108,16 @@ class Services(BaseModel):
return cs, first return cs, first
async def cancel_service( # TODO: per service cancellation by scope, we aren't using this
self, # anywhere right?
name: str, # async def cancel_service(
# self,
) -> Any: # name: str,
# ) -> Any:
log.info(f'Cancelling `pikerd` service {name}') # log.info(f'Cancelling `pikerd` service {name}')
cs, portal = self.service_tasks[name] # cs, portal = self.service_tasks[name]
cs.cancel() # cs.cancel()
return await portal.cancel_actor() # return await portal.cancel_actor()
_services: Optional[Services] = None _services: Optional[Services] = None
@ -497,3 +494,25 @@ async def maybe_open_emsd(
) as portal: ) as portal:
yield portal yield portal
# TODO: ideally we can start the tsdb "on demand" but it's
# probably going to require "rootless" docker, at least if we don't
# want to expect the user to start ``pikerd`` with root perms all the
# time.
# async def maybe_open_marketstored(
# loglevel: Optional[str] = None,
# **kwargs,
# ) -> tractor._portal.Portal: # noqa
# async with maybe_spawn_daemon(
# 'marketstored',
# service_task_target=spawn_emsd,
# spawn_args={'loglevel': loglevel},
# loglevel=loglevel,
# **kwargs,
# ) as portal:
# yield portal