AaronFiore/electrum
1
0
Fork 0
Code Activity

interface: make sure interface.taskgroup gets cleaned up

Browse Source 
follow-up 0ce89b6d54
This commit is contained in:
SomberNight
2025-06-02 15:24:00 +00:00
parent c13932452a
commit 57704600d9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/interface.py
View File

@@ -360,6 +360,7 @@ class PaddedRSTransport(RSTransport):
async def _poll_sbuffer(self): async def _poll_sbuffer(self):
while not self.is_closing(): while not self.is_closing():
await self._can_send.wait()
await self._sbuffer_has_data_evt.wait() # to avoid busy-waiting await self._sbuffer_has_data_evt.wait() # to avoid busy-waiting
self._maybe_consume_sbuffer() self._maybe_consume_sbuffer()
# If there is still data in the buffer, sleep until it would time out. # If there is still data in the buffer, sleep until it would time out.
@@ -639,6 +640,9 @@ class Interface(Logger):
self.logger.debug(f"(disconnect) trace for {repr(e)}", exc_info=True) self.logger.debug(f"(disconnect) trace for {repr(e)}", exc_info=True)
finally: finally:
self.got_disconnected.set() self.got_disconnected.set()
# Make sure taskgroup gets cleaned-up. This explicit clean-up is needed here
# in case the "with taskgroup" ctx mgr never got a chance to run:
await self.taskgroup.cancel_remaining()
await self.network.connection_down(self) await self.network.connection_down(self)
# if was not 'ready' yet, schedule waiting coroutines: # if was not 'ready' yet, schedule waiting coroutines:
self.ready.cancel() self.ready.cancel()