Merge pull request #44 from hmpf/fix-parse-error-in-getlog

Fix parsing of garbage input to getlog

src/zinolib/controllers/zino1.py

@@ -397,7 +397,11 @@ def parse_response(log_data: Iterable[str]) -> list[LogDict]:
         log_list: List[LogDict] = []
         for row in log_data:
             timestamp, log = row.split(" ", 1)
-            dt = convert_timestamp(int(timestamp))
+            try:
+                timestamp = int(timestamp)
+            except ValueError as e:
+                raise RetryError('Zino 1 is flaking out, retry') from e
+            dt = convert_timestamp(timestamp)
             log_list.append({"date": dt, "log": log})
         return log_list
 

src/zinolib/ritz.py

@@ -86,7 +86,7 @@
 import codecs
 import select
 
-from .config.tcl import parse_tcl_config
+from .config.tcl import parse_tcl_config  # noqa: F401 (used to be in this file)
 from .utils import windows_codepage_cp1252, generate_authtoken
 
 
@@ -260,7 +260,9 @@ def __getattr__(self, name):
             return self.get_downtime()
         else:
             self.__getattribute__(name)
-            # raise AttributeError("%s instance of type %s has no attribute '%s'" % (self.__class__, self._attrs["type"], name))
+            # raise AttributeError(
+            #     "%s instance of type %s has no attribute '%s'" % (self.__class__, self._attrs["type"], name)
+            # )
         return self
 
     def __getitem__(self, key):

src/zinolib/utils.py

@@ -1,6 +1,5 @@
 import functools
 import hashlib
-from typing import Any
 
 
 __all__ = [
@@ -75,7 +74,7 @@ def wrapper(*args, **kwargs):
             except Exception as e:
                 params = f'args={args} kwargs={kwargs}'
                 funcname = function.__name__
-                logger.exception(f'"{funcname}" failed with: {params}\n{e}')
+                logger.exception('"%s" failed with: %s\n%s', funcname, params, e)
                 if reraise:
                     raise
                 return return_value