goodboy
/
tractor
1
0
Fork 2
Code Issues 5 Pull Requests 8 Packages Projects Releases Wiki Activity

Mv to `Channel._do_handshake()` in `open_portal()` 

As per the method migration in the last commit. Also adjust all `.uid`
usage to the new `.aid`.
leslies_extra_appendix
Tyler Goodlet 2025-04-03 13:14:58 -04:00
parent dd3e918cfe
commit eeed5fd7f1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tractor/_portal.py
View File

@ -175,7 +175,7 @@ class Portal:
# not expecting a "main" result # not expecting a "main" result
if self._expect_result_ctx is None: if self._expect_result_ctx is None:
log.warning( log.warning(
f"Portal for {self.channel.uid} not expecting a final" f"Portal for {self.channel.aid} not expecting a final"
" result?\nresult() should only be called if subactor" " result?\nresult() should only be called if subactor"
" was spawned with `ActorNursery.run_in_actor()`") " was spawned with `ActorNursery.run_in_actor()`")
return NoResult return NoResult
@ -222,7 +222,7 @@ class Portal:
# IPC calls # IPC calls
if self._streams: if self._streams:
log.cancel( log.cancel(
f"Cancelling all streams with {self.channel.uid}") f"Cancelling all streams with {self.channel.aid}")
for stream in self._streams.copy(): for stream in self._streams.copy():
try: try:
await stream.aclose() await stream.aclose()
@ -267,7 +267,7 @@ class Portal:
return False return False
reminfo: str = ( reminfo: str = (
f'c)=> {self.channel.uid}\n' f'c)=> {self.channel.aid}\n'
f' |_{chan}\n' f' |_{chan}\n'
) )
log.cancel( log.cancel(
@ -310,7 +310,7 @@ class Portal:
): ):
log.debug( log.debug(
'IPC chan for actor already closed or broken?\n\n' 'IPC chan for actor already closed or broken?\n\n'
f'{self.channel.uid}\n' f'{self.channel.aid}\n'
f' |_{self.channel}\n' f' |_{self.channel}\n'
) )
return False return False
@ -551,8 +551,10 @@ async def open_portal(
await channel.connect() await channel.connect()
was_connected = True was_connected = True
if channel.uid is None: if channel.aid is None:
await actor._do_handshake(channel) await channel._do_handshake(
aid=actor.aid,
)
msg_loop_cs: trio.CancelScope|None = None msg_loop_cs: trio.CancelScope|None = None
if start_msg_loop: if start_msg_loop: