linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop poller threads on shutdown: cosmetics

Browse Source 
cosmetics after gerrit

Change-Id: I4d982f83e3fe5a8c8c821ac718e51b9a58de2a62
This commit is contained in:
zolliker 2025-03-19 15:33:25 +01:00
parent 8d62375483
commit e75b8b0b10
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frappy/modulebase.py
View File

@ -642,13 +642,12 @@ class Module(HasAccessibles):
""" """
if self.__poller: if self.__poller:
self.stopPollThread() self.stopPollThread()
if timeout > 0:
self.__poller.join(timeout) self.__poller.join(timeout)
if self.__poller.is_alive(): if self.__poller.is_alive():
self.log.warning('can not stop poller') self.log.warning('can not stop poller')
def shutdownModule(self): def shutdownModule(self):
"""called when the sever shuts down """called when the server shuts down
any cleanup-work should be performed here, like closing threads and any cleanup-work should be performed here, like closing threads and
saving data. saving data.

10
frappy/secnode.py
View File

@ -257,13 +257,13 @@ class SecNode:
def shutdown_modules(self): def shutdown_modules(self):
"""Call 'shutdownModule' for all modules.""" """Call 'shutdownModule' for all modules."""
# stop pollers # stop pollers
for name in self.modules: for mod in self.modules.values():
self.modules[name].stopPollThread() mod.stopPollThread()
# do not yet join here, as we want to wait in parallel # do not yet join here, as we want to wait in parallel
now = time.time() now = time.time()
deadline = now + 5 deadline = now + 0.5 # should be long enough for most read functions to finish
for name in self.modules: for mod in self.modules.values():
self.modules[name].joinPollThread(now - deadline) mod.joinPollThread(max(0, deadline - now))
now = time.time() now = time.time()
for name in self._getSortedModules(): for name in self._getSortedModules():
self.modules[name].shutdownModule() self.modules[name].shutdownModule()