revpi/revpi-middleware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Rename bus provider attributes for clarity

Browse Source 
Replaced `bus_provider` and `io_bus_provider` with `bp_middleware1` and
`bp_ios1` to improve naming consistency and readability in
`MiddlewareDaemon`.

Signed-off-by: Sven Sager <s.sager@kunbus.com>
This commit is contained in:
Sven Sager
2026-02-06 17:28:35 +01:00
parent 4bd8fa74a9
commit cf90b2dd55
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/revpi_middleware/daemon.py
View File

@@ -30,8 +30,8 @@ class MiddlewareDaemon:
self._reconfigure = False self._reconfigure = False
self._running = True self._running = True
self.bus_provider = None self.bp_middleware1 = None
self.io_bus_provider = None self.bp_ios1 = None
self._configure() self._configure()
log.debug("leave MiddlewareDaemon.__init__") log.debug("leave MiddlewareDaemon.__init__")
@@ -53,34 +53,34 @@ class MiddlewareDaemon:
def dbus_start(self): def dbus_start(self):
log.debug("enter MiddlewareDaemon.dbus_start") log.debug("enter MiddlewareDaemon.dbus_start")
dbus_middleware_running = self.bus_provider and self.bus_provider.is_alive() dbus_middleware1_running = self.bp_middleware1 and self.bp_middleware1.is_alive()
if not dbus_middleware_running: if not dbus_middleware1_running:
self.bus_provider = BusProvider(self._get_bus()) self.bp_middleware1 = BusProvider(self._get_bus())
self.bus_provider.start() self.bp_middleware1.start()
dbus_io_middleware_running = self.io_bus_provider and self.io_bus_provider.is_alive() dbus_ios1_running = self.bp_ios1 and self.bp_ios1.is_alive()
if not dbus_io_middleware_running: if not dbus_ios1_running:
self.io_bus_provider = BusProviderIo(self._get_bus()) self.bp_ios1 = BusProviderIo(self._get_bus())
self.io_bus_provider.start() self.bp_ios1.start()
log.debug("leave MiddlewareDaemon.dbus_start") log.debug("leave MiddlewareDaemon.dbus_start")
def dbus_stop(self): def dbus_stop(self):
log.debug("enter MiddlewareDaemon.dbus_stop") log.debug("enter MiddlewareDaemon.dbus_stop")
if self.bus_provider: if self.bp_middleware1:
self.bus_provider.stop() self.bp_middleware1.stop()
self.bus_provider.join(timeout=10.0) self.bp_middleware1.join(timeout=10.0)
if self.bus_provider.is_alive(): if self.bp_middleware1.is_alive():
log.warning("dbus provider thread is still alive") log.warning("dbus middleware1 provider thread is still alive")
self.bus_provider.bus.con.close() self.bp_middleware1.bus.con.close()
if self.io_bus_provider: if self.bp_ios1:
self.io_bus_provider.stop() self.bp_ios1.stop()
self.io_bus_provider.join(timeout=10.0) self.bp_ios1.join(timeout=10.0)
if self.io_bus_provider.is_alive(): if self.bp_ios1.is_alive():
log.warning("dbus io provider thread is still alive") log.warning("dbus ios1 provider thread is still alive")
self.io_bus_provider.bus.con.close() self.bp_ios1.bus.con.close()
log.debug("leave MiddlewareDaemon.dbus_stop") log.debug("leave MiddlewareDaemon.dbus_stop")