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

Add an explicit messaging error for reporting an illegal context transaction

expected_ctx_cancelled
Tyler Goodlet 2021-12-14 23:21:28 -05:00
parent e2139c2bf0
commit 8c004c1f36
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tractor/_portal.py
View File

@ -27,6 +27,7 @@ from typing import (
) )
from functools import partial from functools import partial
from dataclasses import dataclass from dataclasses import dataclass
from pprint import pformat
import warnings import warnings
import trio import trio
@ -85,6 +86,9 @@ def _unwrap_msg(
assert msg.get('cid'), "Received internal error at portal?" assert msg.get('cid'), "Received internal error at portal?"
raise unpack_error(msg, channel) raise unpack_error(msg, channel)
class MessagingError(Exception):
'Some kind of unexpected SC messaging dialog issue'
class Portal: class Portal:
''' '''
@ -408,8 +412,6 @@ class Portal:
raise TypeError( raise TypeError(
f'{func} must be an async generator function!') f'{func} must be an async generator function!')
__tracebackhide__ = True
fn_mod_path, fn_name = func_deats(func) fn_mod_path, fn_name = func_deats(func)
ctx = await self.actor.start_remote_task( ctx = await self.actor.start_remote_task(
@ -435,7 +437,10 @@ class Portal:
# raise kerr from unpack_error(msg, self.channel) # raise kerr from unpack_error(msg, self.channel)
raise unpack_error(msg, self.channel) from None raise unpack_error(msg, self.channel) from None
else: else:
raise raise MessagingError(
f'Context for {ctx.cid} was expecting a `started` message'
f' but received a non-error msg:\n{pformat(msg)}'
)
_err: Optional[BaseException] = None _err: Optional[BaseException] = None
ctx._portal = self ctx._portal = self