Skip to content

network: Avoid notifier re-creating in connect function #621

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
xndcn wants to merge 2 commits into
base: master
Choose a base branch
from
+35 −2
Open

network: Avoid notifier re-creating in connect function #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f4363a
network: Avoid notifier re-creating in connect function
xndcn Dec 9, 2025
ddb4f28
test: Add regression tests for notifier lifecycle
xndcn May 1, 2026
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
9 changes: 7 additions & 2 deletions canopen/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ def connect(self, *args, **kwargs) -> Network:
if self.bus is None:
self.bus = can.Bus(*args, **kwargs)
logger.info("Connected to '%s'", self.bus.channel_info)
self.notifier = can.Notifier(self.bus, self.listeners, self.NOTIFIER_CYCLE)
if self.notifier is None:
self.notifier = can.Notifier(self.bus, self.listeners, self.NOTIFIER_CYCLE)
return self

def disconnect(self) -> None:
Expand All @@ -123,7 +124,11 @@ def disconnect(self) -> None:
if self.bus is not None:
self.bus.shutdown()
self.bus = None
self.check()
try:
self.check()
finally:
# Release notifier after check
self.notifier = None

def __enter__(self):
return self
Expand Down
28 changes: 28 additions & 0 deletions test/test_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,34 @@ def wait_for_periodicity():
if msg is not None:
self.assertIsNone(bus.recv(PERIOD))

def test_network_connect_does_not_recreate_notifier(self):
self.network.connect(interface="virtual")
self.addCleanup(self.network.disconnect)
notifier1 = self.network.notifier
self.assertIsNotNone(notifier1)
# Calling connect() again should reuse the existing notifier
self.network.connect(interface="virtual")
self.assertIs(self.network.notifier, notifier1)

def test_network_disconnect_releases_notifier(self):
self.network.connect(interface="virtual")
self.assertIsNotNone(self.network.notifier)
self.network.disconnect()
self.assertIsNone(self.network.notifier)

def test_network_disconnect_releases_notifier_on_exception(self):
self.network.connect(interface="virtual")

class Custom(Exception):
pass

self.network.notifier.exception = Custom("fake")
with self.assertRaises(Custom):
with self.assertLogs(level=logging.ERROR):
self.network.disconnect()
# Notifier must be released even when check() raises
self.assertIsNone(self.network.notifier)


class TestScanner(unittest.TestCase):
TIMEOUT = 0.1
Expand Down