Improve logging helper

latecomers/helpers.py

@@ -1,17 +1,23 @@
 # -*- encoding: utf-8 -*-
+import functools
 import logging
+import sys
 import typing as T
 
 
 def logit(logger: logging.Logger) -> T.Callable[..., T.Any]:
     def wrapper(func: T.Callable[..., T.Any]) -> T.Callable[..., T.Any]:
+        @functools.wraps(func)
         def inner(*args, **kwargs):
             try:
                 value = func(*args, **kwargs)
-                logger.info(f"Success: {func.__name__}(args={args}, kwargs={kwargs})")
+                logger.info(f"Success: {func.__name__}")
+                logger.debug(f"{func.__name__}(args={args}, kwargs={kwargs})")
                 return value
             except Exception as e:
                 logger.error(f"Failure: {e}")
+                logger.debug(f"{func.__name__}(args={args}, kwargs={kwargs})")
+                sys.exit(1)
 
         return inner
 
@@ -25,16 +31,19 @@ def retry_and_log(logger: logging.Logger, retries: int):
     """
 
     def wrapper(func: T.Callable[..., T.Any]) -> T.Callable[..., T.Any]:
+        @functools.wraps(func)
         def inner(*args, **kwargs):
             for i in range(retries):
                 try:
                     value = func(*args, **kwargs)
-                    logger.info(
-                        f"Success ({i+1} tentative): {func.__name__}(args={args}, kwargs={kwargs})"  # noqa: E501
-                    )
+                    logger.info(f"Success ({i+1} tentative): {func.__name__}")
+                    logger.debug(f"{func.__name__}(args={args}, kwargs={kwargs})")
                     return value
                 except Exception as e:
                     logger.error(f"Failure ({i+1} tentative): {e}")
+                    logger.debug(f"{func.__name__}(args={args}, kwargs={kwargs})")
+
+            sys.exit(2)
 
         return inner
 

latecomers/parse.py

@@ -1,9 +1,12 @@
 # -*- encoding: utf-8 -*-
 from dataclasses import dataclass
 from enum import Enum
+import logging
 import re
 import typing as T
 
+from latecomers.helpers import logit
+
 from lxml import etree as et
 
 TIME_RE = re.compile(r"\d\d?:\d\d")
@@ -11,6 +14,8 @@ AIRPORT_RE = re.compile(r"[\w\d\s\S]+")
 STATUS_RE = re.compile(r"(Arrivato|In Arrivo|Schedulato|Cancellato)")
 PARSER = et.HTMLParser()
 
+logger = logging.getLogger(__name__)
+
 
 def not_empty(obj: et._Element) -> bool:
     if type(obj) is et._Element:
@@ -20,6 +25,7 @@ def not_empty(obj: et._Element) -> bool:
     raise RuntimeError(f"provided argument is of unsupported type: {type(obj)}")
 
 
+@logit(logger)
 def find_table(html_content: T.Text) -> T.List[et._ElementTree]:
     """
     Find the table that holds the data in the html response