The changes necessary to upgrade the kiosk to use python3.7.

[kiosk.git] / kiosk.py

diff --git a/kiosk.py b/kiosk.py
index 379e196cbdd0563a950cf772692b441b94ee1054..b7fb9d96cc728625cfe635bf242d075979397be0 100755 (executable)
--- a/kiosk.py
+++ b/kiosk.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/local/bin/python3.7
 
 import sys
 import traceback
@@ -25,10 +25,10 @@ def thread_change_current():
         (page, triggered) = page_chooser.choose_next_page()
 
         if triggered:
-            print('chooser[%s] - WE ARE TRIGGERED.' % utils.timestamp())
+            print(('chooser[%s] - WE ARE TRIGGERED.' % utils.timestamp()))
             if page != last_page:
-                print('chooser[%s] - EMERGENCY PAGE %s LOAD NEEDED' % (
-                    utils.timestamp(), page))
+                print(('chooser[%s] - EMERGENCY PAGE %s LOAD NEEDED' % (
+                    utils.timestamp(), page)))
                 f = open(os.path.join(constants.pages_dir,
                                       "current.shtml"), "w")
                 emit_wrapped(f, page)
@@ -47,10 +47,10 @@ def thread_change_current():
 
         elif now >= swap_page_target:
             if (page == last_page):
-                print('chooser[%s] - nominal choice got the same page...' % (
-                    utils.timestamp()))
+                print(('chooser[%s] - nominal choice got the same page...' % (
+                    utils.timestamp())))
                 continue
-            print('chooser[%s] - nominal choice of %s' % (utils.timestamp(), page))
+            print(('chooser[%s] - nominal choice of %s' % (utils.timestamp(), page)))
             try:
                 f = open(os.path.join(constants.pages_dir,
                                       "current.shtml"), "w")
@@ -59,7 +59,7 @@ def thread_change_current():
                 last_page = page
                 swap_page_target = now + constants.refresh_period_sec
             except:
-                print('chooser[%s] - page does not exist?!' % (utils.timestamp()))
+                print(('chooser[%s] - page does not exist?!' % (utils.timestamp())))
                 continue
         time.sleep(1.0)
 
@@ -242,17 +242,19 @@ def emit_wrapped(f, filename):
 
 def thread_invoke_renderers():
     while True:
+        print("Renderer thread[%s]: invoking all renderers in catalog..." % (
+            utils.timestamp()))
         for r in renderer_catalog.get_renderers():
             try:
                 r.render()
             except Exception as e:
                 traceback.print_exc()
-                print("renderer[%s] unknown exception, swallowing it." % (
-                    utils.timestamp()))
+                print(("renderer[%s] unknown exception, swallowing it." % (
+                    utils.timestamp())))
             except Error as e:
                 traceback.print_exc()
-                print("renderer[%s] unknown error, swallowing it." % (
-                    utils.timestamp()))
+                print(("renderer[%s] unknown error, swallowing it." % (
+                    utils.timestamp())))
         time.sleep(constants.render_period_sec)
 
 if __name__ == "__main__":
@@ -262,12 +264,12 @@ if __name__ == "__main__":
     while True:
         if (changer_thread == None or
             not changer_thread.is_alive()):
-            print("chooser[%s] - (Re?)initializing chooser thread..." % utils.timestamp())
+            print(("chooser[%s] - (Re?)initializing chooser thread..." % utils.timestamp()))
             changer_thread = Thread(target = thread_change_current, args=())
             changer_thread.start()
         if (renderer_thread == None or
             not renderer_thread.is_alive()):
-            print("renderer[%s] - (Re?)initializing render thread..." % utils.timestamp())
+            print(("renderer[%s] - (Re?)initializing render thread..." % utils.timestamp()))
             renderer_thread = Thread(target = thread_invoke_renderers, args=())
             renderer_thread.start()
         time.sleep(10000)