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 1 commit into
base: master
Choose a base branch
from
Open

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

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
11 changes: 9 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,13 @@ def disconnect(self) -> None:
if self.bus is not None:
self.bus.shutdown()
self.bus = None
self.check()
try:
self.check()
except Exception as e:
raise e
finally:
# Release notifier after check
self.notifier = None

def __enter__(self):
return self
Expand Down