Various changes

[kiosk.git] / renderer.py

diff --git a/renderer.py b/renderer.py
index 491d34d52f9b32a9090294b40c21358e42f892fd..b78eb2b713e3b4901a912f8e763a90ee818953f3 100644 (file)
--- a/renderer.py
+++ b/renderer.py
@@ -1,8 +1,11 @@
 import time
 from datetime import datetime
+from decorators import invokation_logged
 
 class renderer(object):
     """Base class for something that can render."""
+
+    @invokation_logged
     def render(self):
         pass
 
@@ -39,17 +42,18 @@ class abstaining_renderer(renderer):
                 tries_per_key[key] = 0
 
             if tries_per_key[key] >= 3:
-                print('renderer: Too many failures/retries for "%s.%s", ' +
-                      ', giving up for now' % (self.get_name(), key))
+                print('renderer: Too many failures for "%s.%s", giving up' % (
+                    self.get_name(), key))
                 keys_to_skip.add(key)
             else:
                 msg = 'renderer: executing "%s.%s"' % (self.get_name(), key)
                 if (tries_per_key[key] > 1):
-                    msg = msg + " (retry %d)" % tries_per_key[key]
+                    msg = msg + " (retry #%d)" % tries_per_key[key]
                 print(msg)
                 if (self.periodic_render(key)):
                     self.last_runs[key] = time.time()
 
+    @invokation_logged
     def periodic_render(self, key):
         pass