revpi/revpipyload
1
0
Fork 0
mirror of https://github.com/naruxde/revpipyload.git synced 2026-08-16 13:07:03 +02:00
Code Issues Packages Releases Wiki Activity

refactor: Replace _exit flag with _evt_exit event

Browse Source 
Replaced the `_exit` boolean flag with an `Event` object (`_evt_exit`)
to improve thread-safe control of the program's shutdown process.

Signed-off-by: Sven Sager <akira@narux.de>
This commit is contained in:
akira
2026-08-04 09:11:41 +02:00
parent 9f7f8262bb
commit 835c3a1b61
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/revpipyload/revpipyload.py
+9 -8
View File
@@ -69,7 +69,8 @@ class RevPiPyLoad:
proginit.logger.debug("enter RevPiPyLoad.__init__()") proginit.logger.debug("enter RevPiPyLoad.__init__()")
# Klassenattribute # Klassenattribute
self._exit = True self._evt_exit = Event()
self._evt_exit.set()
self.evt_loadconfig = Event() self.evt_loadconfig = Event()
self.globalconfig = ConfigParser() self.globalconfig = ConfigParser()
proginit.conf = self.globalconfig proginit.conf = self.globalconfig
@@ -343,7 +344,7 @@ class RevPiPyLoad:
self.stop_plcmqtt() self.stop_plcmqtt()
self.th_plcmqtt = self._plcmqtt() self.th_plcmqtt = self._plcmqtt()
if not self._exit and self.th_plcmqtt is not None: if not self._evt_exit.is_set() and self.th_plcmqtt is not None:
proginit.logger.info("restart mqtt publisher after reload") proginit.logger.info("restart mqtt publisher after reload")
self.th_plcmqtt.start() self.th_plcmqtt.start()
@@ -352,7 +353,7 @@ class RevPiPyLoad:
self.stop_plcprogram() self.stop_plcprogram()
self.plc = self._plcthread() self.plc = self._plcthread()
if not self._exit and self.plc is not None and self.autostart: if not self._evt_exit.is_set() and self.plc is not None and self.autostart:
proginit.logger.info("restart plc program after reload") proginit.logger.info("restart plc program after reload")
self.plc.start() self.plc.start()
@@ -372,7 +373,7 @@ class RevPiPyLoad:
self.stop_plcserver() self.stop_plcserver()
self.th_plcserver = self._plcserver() self.th_plcserver = self._plcserver()
if not self._exit and self.th_plcserver is not None: if not self._evt_exit.is_set() and self.th_plcserver is not None:
proginit.logger.info("restart plc server after reload") proginit.logger.info("restart plc server after reload")
self.th_plcserver.start() self.th_plcserver.start()
@@ -485,7 +486,7 @@ class RevPiPyLoad:
proginit.logger.debug("created xmlrpc server") proginit.logger.debug("created xmlrpc server")
# Neustart bei reload # Neustart bei reload
if not self._exit: if not self._evt_exit.is_set():
proginit.logger.info("bind xmlrpc-server") proginit.logger.info("bind xmlrpc-server")
self.xsrv.server_bind() self.xsrv.server_bind()
self.xsrv.server_activate() self.xsrv.server_activate()
@@ -762,7 +763,7 @@ class RevPiPyLoad:
proginit.logger.debug("enter RevPiPyLoad.start()") proginit.logger.debug("enter RevPiPyLoad.start()")
proginit.logger.info("starting revpipyload") proginit.logger.info("starting revpipyload")
self._exit = False self._evt_exit.clear()
if self.xmlrpc and self.xsrv is not None: if self.xmlrpc and self.xsrv is not None:
proginit.logger.info("bind xmlrpc-server") proginit.logger.info("bind xmlrpc-server")
@@ -786,7 +787,7 @@ class RevPiPyLoad:
pictory_reset_driver.register_call(self.xml_psstop) pictory_reset_driver.register_call(self.xml_psstop)
# mainloop # mainloop
while not self._exit: while not self._evt_exit.is_set():
# Neue Konfiguration laden # Neue Konfiguration laden
if self.evt_loadconfig.is_set(): if self.evt_loadconfig.is_set():
proginit.logger.info("got reqeust to reload config") proginit.logger.info("got reqeust to reload config")
@@ -887,7 +888,7 @@ class RevPiPyLoad:
def stop(self): def stop(self):
"""Stop revpipyload.""" """Stop revpipyload."""
proginit.logger.debug("enter RevPiPyLoad.stop()") proginit.logger.debug("enter RevPiPyLoad.stop()")
self._exit = True self._evt_exit.set()
proginit.logger.debug("leave RevPiPyLoad.stop()") proginit.logger.debug("leave RevPiPyLoad.stop()")
def stop_plcmqtt(self): def stop_plcmqtt(self):