Be more pedantic with error handling

bi_streaming
Tyler Goodlet 2021-05-10 07:23:39 -04:00
parent 68d600d7ee
commit d59e9edec8
2 changed files with 27 additions and 21 deletions

View File

@ -358,12 +358,14 @@ class Portal:
fn_mod_path, fn_name = func_deats(func) fn_mod_path, fn_name = func_deats(func)
try:
cid, recv_chan, functype, first_msg = await self._submit( cid, recv_chan, functype, first_msg = await self._submit(
fn_mod_path, fn_name, kwargs) fn_mod_path, fn_name, kwargs)
assert functype == 'context' assert functype == 'context'
msg = await recv_chan.receive() msg = await recv_chan.receive()
try: try:
# the "first" value here is delivered by the callee's # the "first" value here is delivered by the callee's
# ``Context.started()`` call. # ``Context.started()`` call.
@ -377,14 +379,18 @@ class Portal:
raise unpack_error(msg, self.channel) raise unpack_error(msg, self.channel)
else: else:
raise raise
try:
# deliver context instance and .started() msg value in open
# tuple.
ctx = Context(self.channel, cid, _portal=self) ctx = Context(self.channel, cid, _portal=self)
try:
yield ctx, first yield ctx, first
finally: finally:
await recv_chan.aclose()
await ctx.cancel() await ctx.cancel()
finally:
await recv_chan.aclose()
@dataclass @dataclass
class LocalPortal: class LocalPortal:

View File

@ -357,7 +357,8 @@ async def open_nursery(
try: try:
if actor is None and is_main_process(): if actor is None and is_main_process():
# if we are the parent process start the actor runtime implicitly # if we are the parent process start the
# actor runtime implicitly
log.info("Starting actor runtime!") log.info("Starting actor runtime!")
# mark us for teardown on exit # mark us for teardown on exit
@ -376,7 +377,6 @@ async def open_nursery(
async with _open_and_supervise_one_cancels_all_nursery( async with _open_and_supervise_one_cancels_all_nursery(
actor actor
) as anursery: ) as anursery:
yield anursery yield anursery
finally: finally: