X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=renderer.py;h=55f540c026f481d577dade1b7936750865fae42b;hb=09215cf1a1498c99ee75a7cbef3ea62f58a56f0d;hp=83ace25b14f100fdb9916bbb996d9a09cdbda389;hpb=6b8d4eeb7153617221f822a243a117f0bcab07bf;p=kiosk.git

diff --git a/renderer.py b/renderer.py
index 83ace25..55f540c 100644
--- a/renderer.py
+++ b/renderer.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 
 from abc import ABC, abstractmethod
-from decorators import invocation_logged
 import logging
 import time
 from typing import Dict, Optional, Set
 
+from pyutils.decorator_utils import invocation_logged
 
-logger = logging.getLogger(__file__)
+
+logger = logging.getLogger(__name__)
 
 
 class renderer(ABC):
@@ -47,32 +48,28 @@ class abstaining_renderer(renderer):
         while True:
             key = self.should_render(keys_to_skip)
             if key is None:
-                logger.info(
-                    f'renderer: Found nothing to do in "{self.get_name()}"; returning.'
-                )
+                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}'
+            op = f"{self.get_name()}.{key}"
 
             if tries_per_key[key] >= 3:
-                logger.warning(
-                    f'renderer: Too many failures in "{op}"; giving up.'
-                )
+                logger.warning(f'Too many failures in "{op}"; giving up.')
                 keys_to_skip.add(key)
             else:
-                msg = f'renderer: executing "{op}"'
+                msg = f'Executing "{op}"'
                 if tries_per_key[key] > 1:
-                    msg = msg + f' (retry #{tries_per_key[key]})'
+                    msg = msg + f" (retry #{tries_per_key[key]})"
                 logger.info(msg)
                 if self.periodic_render(key):
-                    logger.debug(f'renderer: {op} succeeded.')
+                    logger.debug(f'"{op}" succeeded.')
                     self.last_runs[key] = time.time()
                 else:
-                    logger.warning(f'renderer: {op} failed; returned False.')
+                    logger.warning(f'"{op}" failed; returned False.')
 
     @invocation_logged
     @abstractmethod