refactor: api.py error handling

davidrapan · Dec 16, 2024 · 5255e3e · 5255e3e
1 parent d77eedd
commit 5255e3e
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/custom_components/solarman/api.py b/custom_components/solarman/api.py
@@ -234,16 +234,12 @@ async def get(self, runtime = 0, requests = None):
                         _LOGGER.debug(f"[{self.config.serial}] Returning {rcount} new value{'s' if rcount > 1 else ''}. [Previous State: {self.state.print} ({self.state.value})]")
                         self.state.update()
 
-        except (TimeoutError, Exception) as e:
-            _LOGGER.debug(f"[{self.config.serial}] Fetching failed. [Previous State: {self.state.print} ({self.state.value})]")
-
+        except Exception as e:
             await self.endpoint.discover()
-
             if self.state.reevaluate():
                 await self.modbus.disconnect()
                 raise
-
-            _LOGGER.debug(f"[{self.config.serial}] {"Timeout" if isinstance(e, TimeoutError) else "Error"} fetching {self.config.name} data: {format_exception(e)}")
+            _LOGGER.debug(f"[{self.config.serial}] {"Timeout" if isinstance(e, TimeoutError) else "Error"} fetching {self.config.name} data. [Previous State: {self.state.print} ({self.state.value}), {format_exception(e)}]")
 
         return result