Catch and delay errors in the root if debugger is active
parent
2b4cf6157a
commit
c74c2956e4
|
@ -11,6 +11,7 @@ import warnings
|
||||||
import trio
|
import trio
|
||||||
from async_generator import asynccontextmanager
|
from async_generator import asynccontextmanager
|
||||||
|
|
||||||
|
from . import _debug
|
||||||
from ._state import current_actor, is_main_process
|
from ._state import current_actor, is_main_process
|
||||||
from .log import get_logger, get_loglevel
|
from .log import get_logger, get_loglevel
|
||||||
from ._actor import Actor
|
from ._actor import Actor
|
||||||
|
@ -367,10 +368,26 @@ async def open_nursery(
|
||||||
async with open_root_actor(**kwargs) as actor:
|
async with open_root_actor(**kwargs) as actor:
|
||||||
assert actor is current_actor()
|
assert actor is current_actor()
|
||||||
|
|
||||||
async with _open_and_supervise_one_cancels_all_nursery(
|
try:
|
||||||
actor
|
async with _open_and_supervise_one_cancels_all_nursery(
|
||||||
) as anursery:
|
actor
|
||||||
yield anursery
|
) as anursery:
|
||||||
|
yield anursery
|
||||||
|
|
||||||
|
except (Exception, trio.MultiError, trio.Cancelled):
|
||||||
|
# if we error in the root but the debugger is
|
||||||
|
# engaged we don't want to prematurely kill (and
|
||||||
|
# thus clobber access to) the local tty streams.
|
||||||
|
# instead try to wait for pdb to be released before
|
||||||
|
# tearing down.
|
||||||
|
if not _debug._pdb_complete.is_set():
|
||||||
|
log.warning(
|
||||||
|
"Root has errored but pdb is active..waiting "
|
||||||
|
"on debug lock")
|
||||||
|
with trio.CancelScope(shield=True):
|
||||||
|
await _debug._pdb_complete.wait()
|
||||||
|
|
||||||
|
raise
|
||||||
|
|
||||||
else: # sub-nursery case
|
else: # sub-nursery case
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue