Refactor data update threads

timmo001 · Dec 30, 2023 · 9b2b3e0 · 9b2b3e0
1 parent 713bbf5
commit 9b2b3e0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/systembridgebackend/handlers/data.py b/systembridgebackend/handlers/data.py
@@ -19,8 +19,8 @@ def __init__(
         """Initialise."""
         super().__init__()
         self._updated_callback = updated_callback
-        self._update_thread: DataUpdateThread | None = None
-        self._update_media_thread: MediaUpdateThread | None = None
+        self.update_data_thread: DataUpdateThread | None = None
+        self.update_media_thread: MediaUpdateThread | None = None
 
         self.data = ModulesData()
 
@@ -35,23 +35,23 @@ async def _data_updated_callback(
 
     def request_update_data(self) -> None:
         """Request update data."""
-        if self._update_thread is not None and self._update_thread.is_alive():
+        if self.update_data_thread is not None and self.update_data_thread.is_alive():
             self._logger.info("Update data thread already running")
             return
 
         self._logger.info("Starting update data thread..")
-        self._update_thread = DataUpdateThread(self._data_updated_callback)
-        self._update_thread.start()
+        self.update_data_thread = DataUpdateThread(self._data_updated_callback)
+        self.update_data_thread.start()
 
     def request_update_media_data(self) -> None:
         """Request update media data."""
         if (
-            self._update_media_thread is not None
-            and self._update_media_thread.is_alive()
+            self.update_media_thread is not None
+            and self.update_media_thread.is_alive()
         ):
             self._logger.info("Update media thread already running")
             return
 
         self._logger.info("Starting update media thread..")
-        self._update_media_thread = MediaUpdateThread(self._data_updated_callback)
-        self._update_media_thread.start()
+        self.update_media_thread = MediaUpdateThread(self._data_updated_callback)
+        self.update_media_thread.start()
diff --git a/systembridgebackend/modules/__init__.py b/systembridgebackend/modules/__init__.py
@@ -109,4 +109,4 @@ async def update_data(self) -> None:
             # Stagger the updates to avoid overloading the system
             await asyncio.sleep(1)
 
-        self._logger.info("Data updates requested")
+        self._logger.info("Data update threads started")
diff --git a/systembridgebackend/server/__init__.py b/systembridgebackend/server/__init__.py
@@ -176,10 +176,10 @@ def exit_application(self) -> None:
         self._logger.info("Event loop stopped")
 
         # Stop threads
-        if api_app.data_update._update_thread is not None:
-            api_app.data_update._update_thread.join(timeout=2)
-        if api_app.data_update._update_media_thread is not None:
-            api_app.data_update._update_media_thread.join(timeout=2)
+        if api_app.data_update.update_data_thread is not None:
+            api_app.data_update.update_data_thread.join(timeout=2)
+        if api_app.data_update.update_media_thread is not None:
+            api_app.data_update.update_media_thread.join(timeout=2)
         self._logger.info("Threads joined")
 
         self._logger.info("Exit Application")