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