Merge branch 'master' of ssh://git.house:/usr/local/git/base/kiosk

[kiosk.git] / renderer.py

diff --git a/renderer.py b/renderer.py
index fa95e346ec7ceb4ffabfd1179057f9fd512bb796..55f540c026f481d577dade1b7936750865fae42b 100644 (file)
--- a/renderer.py
+++ b/renderer.py
@@ -1,10 +1,14 @@
 #!/usr/bin/env python3
 
 from abc import ABC, abstractmethod
-from datetime import datetime
-from decorators import invocation_logged
+import logging
 import time
-from typing import Dict, List, Set
+from typing import Dict, Optional, Set
+
+from pyutils.decorator_utils import invocation_logged
+
+
+logger = logging.getLogger(__name__)
 
 
 class renderer(ABC):
@@ -26,9 +30,9 @@ class abstaining_renderer(renderer):
         self.name_to_timeout_dict = name_to_timeout_dict
         self.last_runs = {}
         for key in name_to_timeout_dict:
-            self.last_runs[key] = 0
+            self.last_runs[key] = 0.0
 
-    def should_render(self, keys_to_skip: Set[str]) -> str:
+    def should_render(self, keys_to_skip: Set[str]) -> Optional[str]:
         now = time.time()
         for key in self.name_to_timeout_dict:
             if (
@@ -39,31 +43,33 @@ class abstaining_renderer(renderer):
 
     @invocation_logged
     def render(self) -> None:
-        tries_per_key = {}
-        keys_to_skip = set()
+        tries_per_key: Dict[str, int] = {}
+        keys_to_skip: Set[str] = set()
         while True:
             key = self.should_render(keys_to_skip)
-            if key == None:
+            if key is None:
+                logger.info(f'Found nothing to do in "{self.get_name()}"; returning.')
                 break
 
             if key in tries_per_key:
                 tries_per_key[key] += 1
             else:
                 tries_per_key[key] = 0
+            op = f"{self.get_name()}.{key}"
 
             if tries_per_key[key] >= 3:
-                print(
-                    'renderer: Too many failures for "%s.%s", giving up'
-                    % (self.get_name(), key)
-                )
+                logger.warning(f'Too many failures in "{op}"; giving up.')
                 keys_to_skip.add(key)
             else:
-                msg = 'renderer: executing "%s.%s"' % (self.get_name(), key)
+                msg = f'Executing "{op}"'
                 if tries_per_key[key] > 1:
-                    msg = msg + " (retry #%d)" % tries_per_key[key]
-                print(msg)
+                    msg = msg + f" (retry #{tries_per_key[key]})"
+                logger.info(msg)
                 if self.periodic_render(key):
+                    logger.debug(f'"{op}" succeeded.')
                     self.last_runs[key] = time.time()
+                else:
+                    logger.warning(f'"{op}" failed; returned False.')
 
     @invocation_logged
     @abstractmethod
@@ -72,31 +78,3 @@ class abstaining_renderer(renderer):
 
     def get_name(self) -> str:
         return self.__class__.__name__
-
-
-class debuggable_abstaining_renderer(abstaining_renderer):
-    def __init__(self, name_to_timeout_dict: Dict[str, int], debug: bool) -> None:
-        super(debuggable_abstaining_renderer, self).__init__(name_to_timeout_dict)
-        self.debug = debug
-
-    def debug_prefix(self) -> str:
-        return self.get_name()
-
-    def being_debugged(self) -> bool:
-        return self.debug
-
-    def debug_print(self, template: str, *args) -> None:
-        try:
-            if self.being_debugged():
-                if args:
-                    msg = template.format(args)
-                else:
-                    msg = template
-
-                # current date and time
-                now = datetime.now()
-                timestamp = now.strftime("%d-%b-%Y (%H:%M:%S.%f)")
-                print("%s(%s): %s" % (self.debug_prefix(), timestamp, msg))
-        except Exception as e:
-            print("Exception in debug_print!")
-            print(e)