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

Another cancel-req-invalid log msg fmt tweak

mv_to_new_trio_py3.11
Tyler Goodlet 2024-03-20 10:42:17 -04:00
parent d5e5174d97
commit 290b0a86b1
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/_runtime.py
View File

@ -715,10 +715,12 @@ class Actor:
f'|_{chan}\n' f'|_{chan}\n'
) )
try: try:
# send a msg loop terminate sentinel # send msg loop terminate sentinel which
# triggers cancellation of all remotely
# started tasks.
await chan.send(None) await chan.send(None)
# XXX: do we want this? # XXX: do we want this? no right?
# causes "[104] connection reset by peer" on other end # causes "[104] connection reset by peer" on other end
# await chan.aclose() # await chan.aclose()
@ -1208,10 +1210,10 @@ class Actor:
# - callee self raises ctxc before caller send request, # - callee self raises ctxc before caller send request,
# - callee errors prior to cancel req. # - callee errors prior to cancel req.
log.cancel( log.cancel(
'Cancel request invalid, RPC task already completed?\n' 'Cancel request invalid, RPC task already completed?\n\n'
f'<= canceller: {requesting_uid}\n\n' f'<= canceller: {requesting_uid}\n\n'
f'=>{parent_chan}\n' f'=> {cid}@{parent_chan.uid}\n'
f' |_ctx-id: {cid}\n' f' |_{parent_chan}\n'
) )
return True return True
@ -1510,7 +1512,6 @@ async def async_main(
): ):
accept_addrs = set_accept_addr_says_rent accept_addrs = set_accept_addr_says_rent
# The "root" nursery ensures the channel with the immediate # The "root" nursery ensures the channel with the immediate
# parent is kept alive as a resilient service until # parent is kept alive as a resilient service until
# cancellation steps have (mostly) occurred in # cancellation steps have (mostly) occurred in