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

Set remote errors in `_raise_from_unexpected_msg()` 

By calling `Context._maybe_cancel_and_set_remote_error(exc)` on any
unpacked `Error` msg; provides for `Context.maybe_error` consistency to
match all other error delivery cases.
runtime_to_msgspec
Tyler Goodlet 2024-05-28 15:30:30 -04:00
parent 6c2efc96dc
commit 59ca256183
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tractor/_exceptions.py
View File

@ -902,7 +902,7 @@ def pack_error(
tb_str: str = ( tb_str: str = (
''.join(traceback.format_exception(exc)) ''.join(traceback.format_exception(exc))
# TODO: can we remove this is `exc` is required? # TODO: can we remove this since `exc` is required.. right?
or or
# NOTE: this is just a shorthand for the "last error" as # NOTE: this is just a shorthand for the "last error" as
# provided by `sys.exeception()`, see: # provided by `sys.exeception()`, see:
@ -917,8 +917,8 @@ def pack_error(
# when caller provides a tb instance (say pulled from some other # when caller provides a tb instance (say pulled from some other
# src error's `.__traceback__`) we use that as the "boxed" # src error's `.__traceback__`) we use that as the "boxed"
# tb-string instead. # tb-string instead.
if tb:
# https://docs.python.org/3/library/traceback.html#traceback.format_list # https://docs.python.org/3/library/traceback.html#traceback.format_list
if tb:
tb_str: str = ''.join(traceback.format_tb(tb)) + tb_str tb_str: str = ''.join(traceback.format_tb(tb)) + tb_str
error_msg: dict[ # for IPC error_msg: dict[ # for IPC
@ -961,15 +961,15 @@ def pack_error(
error_msg['src_type_str'] = type(exc).__name__ error_msg['src_type_str'] = type(exc).__name__
error_msg['boxed_type_str'] = type(exc).__name__ error_msg['boxed_type_str'] = type(exc).__name__
# XXX alawys append us the last relay in error propagation path # XXX always append us the last relay in error propagation path
error_msg.setdefault( error_msg.setdefault(
'relay_path', 'relay_path',
[], [],
).append(our_uid) ).append(our_uid)
# XXX NOTE: always ensure the traceback-str is from the # XXX NOTE XXX always ensure the traceback-str content is from
# locally raised error (**not** the prior relay's boxed # the locally raised error (so, NOT the prior relay's boxed
# content's in `._ipc_msg.tb_str`). # `._ipc_msg.tb_str`).
error_msg['tb_str'] = tb_str error_msg['tb_str'] = tb_str
if cid is not None: if cid is not None:
@ -1109,6 +1109,7 @@ def _raise_from_unexpected_msg(
msg, msg,
ctx.chan, ctx.chan,
) )
ctx._maybe_cancel_and_set_remote_error(exc)
raise exc from src_err raise exc from src_err
# `MsgStream` termination msg. # `MsgStream` termination msg.