adding more info to log....

ChristianTremblay · Aug 27, 2024 · 57487e9 · 57487e9
1 parent d9afa2e
commit 57487e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/BAC0/core/devices/Device.py b/BAC0/core/devices/Device.py
@@ -200,7 +200,8 @@ async def new_state(self, newstate: Any) -> None:
         :return: None
         """
         self.log(
-            f"Changing device state to {str(newstate).split('.')[-1]}", level="info"
+            f"Changing {self.properties.name} state to {str(newstate).split('.')[-1]}",
+            level="info",
         )
         self.__class__ = newstate
         await self._init_state()
@@ -467,13 +468,15 @@ async def _init_state(self):
         # self.initialized = True
 
     async def _disconnect(self, save_on_disconnect=True, unregister=True):
-        self.log("Wait while stopping polling", level="info")
+        self.log(
+            f"Wait while stopping polling for {self.properties.name}", level="info"
+        )
         self.poll(command="stop")
         if unregister:
             self.properties.network.unregister_device(self)
             self.properties.network = None
         if save_on_disconnect:
-            self.log("Savig device to database...", level="info")
+            self.log(f"Saving {self.properties.name} to database...", level="info")
             await self.save()
         if self.properties.db_name:
             await self.new_state(DeviceFromDB)
@@ -1063,7 +1066,7 @@ async def connect(self, *, network=None, from_backup=None):
             await self._init_state()
 
     async def initialize_device_from_db(self):
-        self.log("Initializing DB", level="info")
+        self.log(f"Initializing DB for {self.properties.name}", level="info")
         # Save important properties for reuse
         if self.properties.db_name:
             dbname = self.properties.db_name
@@ -1072,8 +1075,10 @@ async def initialize_device_from_db(self):
             except ValueError:
                 raise ValueError(f"Can't find {self.properties.db_name} on drive")
         else:
-            self.log("Missing argument DB", level="info")
-            raise ValueError("Please provide db name using device.load_db('name')")
+            self.log(f"Missing argument DB for {self.properties.name}", level="info")
+            raise ValueError(
+                f"Please provide db name using device.load_db('name') for {self.properties.name}"
+            )
 
         # network = self.properties.network
         pss = self.properties.pss
@@ -1101,7 +1106,7 @@ async def initialize_device_from_db(self):
         self.properties.save_resampling = self._props["save_resampling"]
         self.properties.clear_history_on_save = self._props["clear_history_on_save"]
         self.properties.default_history_size = self._props["history_size"]
-        self.log("Device restored from db", level="info")
+        self.log(f"{self.properties.name} restored from db", level="info")
         self.log(
             'You can reconnect to network using : "device.connect(network=bacnet)"',
             level="info",

diff --git a/BAC0/core/devices/mixins/read_mixin.py b/BAC0/core/devices/mixins/read_mixin.py
@@ -618,7 +618,7 @@ def poll(self, command="start", *, delay=10):
 
                 self._polling_task.task = None
                 self._polling_task.running = False
-                self.log("Polling stopped", level="info")
+                self.log(f"{self.properties.name} | Polling stopped", level="info")
 
         elif self._polling_task.task is None:
             self._polling_task.task = _poll_cls(