Skip to content

Cancelling ping_server task potentially kills _conn_lost_cb execution. #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
galindus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Cancelling ping_server task potentially kills _conn_lost_cb execution. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions stan/aio/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,13 +562,17 @@ async def _close(self):
except:
continue
self._sub_map = {}

async def _close_due_to_ping(self, err):
await self._close()
if self._conn_lost_cb is not None:
await self._conn_lost_cb(err)
self._conn_lost_cb = None

async def _shield_close_due_to_ping():
await self._close()
if self._conn_lost_cb is not None:
await self._conn_lost_cb(err)
self._conn_lost_cb = None

await asyncio.shield(_shield_close_due_to_ping(), loop=self._loop)

async def close(self):
"""
Close terminates a session with NATS Streaming.
Expand Down
10 changes: 9 additions & 1 deletion tests/client_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ async def cb(msg):

self.assertEqual(len(msgs), 10)
await sc.close()

@async_test
async def test_ping_responses_trigger_conn_lost_cb(self):
nc = NATS()
Expand All @@ -576,6 +576,10 @@ async def _process_heartbeats(self, msg):
received_error_str = ""
future = asyncio.Future(loop=self.loop)
async def conn_lost_cb(err):
# Added an await on something here, to illustrate that
# cancelling the ping-task, used to also cancel this callback.
await asyncio.sleep(0.1, loop=self.loop)

nonlocal received_error_str
received_error_str = str(err)
future.set_result(True)
Expand Down Expand Up @@ -619,6 +623,10 @@ async def _process_ping_response(self, msg):
received_error_str = ""
future = asyncio.Future(loop=self.loop)
async def conn_lost_cb(err):
# Added an await on something here, to illustrate that
# cancelling the ping-task, used to also cancel this callback.
await asyncio.sleep(0.1, loop=self.loop)

nonlocal received_error_str
received_error_str = str(err)
future.set_result(True)
Expand Down