jc211
/
tractor
forked from goodboy/tractor
1
0
Fork 0
Code Pull Requests Activity

Fix error propagation on asyncio streaming tasks

zombie_lord_infinite
Tyler Goodlet 2021-07-28 12:32:46 -04:00
parent b43539b252
commit ed10f6e0c1
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tractor/to_asyncio.py
View File

@ -83,7 +83,7 @@ def _run_asyncio_task(
coro = func(**kwargs) coro = func(**kwargs)
# cancel_scope = trio.CancelScope() cancel_scope = trio.CancelScope()
# start the asyncio task we submitted from trio # start the asyncio task we submitted from trio
if inspect.isawaitable(coro): if inspect.isawaitable(coro):
@ -109,12 +109,13 @@ def _run_asyncio_task(
if aio_err: if aio_err:
log.exception(f"asyncio task errorred:\n{aio_err}") log.exception(f"asyncio task errorred:\n{aio_err}")
# cancel_scope.cancel() cancel_scope.cancel()
from_aio._err = aio_err from_aio._err = aio_err
from_aio.close()
task.add_done_callback(cancel_trio) task.add_done_callback(cancel_trio)
return task, from_aio, to_trio return task, from_aio, to_trio, cancel_scope
async def run_task( async def run_task(
@ -183,7 +184,7 @@ async def run_task(
# if inspect.isasyncgenfunction(meth) or : # if inspect.isasyncgenfunction(meth) or :
if _treat_as_stream: if _treat_as_stream:
task, from_aio, to_trio = _run_asyncio_task( task, from_aio, to_trio, cs = _run_asyncio_task(
func, func,
qsize=2**8, qsize=2**8,
**kwargs, **kwargs,
@ -218,7 +219,7 @@ async def run_task(
# simple async func # simple async func
try: try:
task, from_aio, to_trio = _run_asyncio_task( task, from_aio, to_trio, cs = _run_asyncio_task(
func, func,
qsize=1, qsize=1,
**kwargs, **kwargs,
@ -227,12 +228,13 @@ async def run_task(
# with cancel_scope: # with cancel_scope:
# async with from_aio: # async with from_aio:
# return single value # return single value
return await from_aio.receive() with cs:
return await from_aio.receive()
# if cancel_scope.cancelled_caught: if cs.cancelled_caught:
# # always raise from any captured asyncio error # always raise from any captured asyncio error
# if aio_err: if from_aio._err:
# raise aio_err raise from_aio._err
# Do we need this? # Do we need this?
except Exception as err: except Exception as err: