Fix logging and remove cruft.

[kiosk.git] / camera_trigger.py

diff --git a/camera_trigger.py b/camera_trigger.py
index 3ca7a3cb43f42996324e14a927f9c6e01b622d36..3eebe2a092947f32ab4204dd4b5f653ca13c71d7 100644 (file)
--- a/camera_trigger.py
+++ b/camera_trigger.py
@@ -8,7 +8,7 @@ from typing import List, Tuple, Optional
 import trigger
 
 
-logger = logging.getLogger(__file__)
+logger = logging.getLogger(__name__)
 
 
 class any_camera_trigger(trigger.trigger):
@@ -58,11 +58,13 @@ class any_camera_trigger(trigger.trigger):
                 filename = f"/timestamps/last_camera_motion_{camera}"
                 ts = os.stat(filename).st_ctime
                 age = now - ts
-                print(f'{camera} => {age}')
+                print(f"{camera} => {age}")
                 if ts != self.last_trigger_timestamp[camera]:
                     self.last_trigger_timestamp[camera] = ts
                     if age < 15:
-                        logger.info(f'{camera} is triggered; {filename} touched {age}s ago (@{ts}')
+                        logger.info(
+                            f"{camera} is triggered; {filename} touched {age}s ago (@{ts}"
+                        )
                         num_cameras_with_recent_triggers += 1
 
                         self.triggers_in_the_past_seven_min[camera] = 0
@@ -74,26 +76,34 @@ class any_camera_trigger(trigger.trigger):
                             age = now - int(x)
                             if age < (60 * 7):
                                 self.triggers_in_the_past_seven_min[camera] += 1
-                                print(f'{camera} past 7m: {self.triggers_in_the_past_seven_min[camera]}')
+                                print(
+                                    f"{camera} past 7m: {self.triggers_in_the_past_seven_min[camera]}"
+                                )
 
             # Second pass, see whether we want to trigger due to
             # camera activity we found.  All cameras timestamps were
             # just considered and should be up-to-date.  Some logic to
             # squelch spammy cameras unless more than one is triggered
             # at the same time.
-            print(f'{num_cameras_with_recent_triggers}')
+            print(f"{num_cameras_with_recent_triggers}")
             for camera in camera_list:
                 if (now - self.last_trigger_timestamp[camera]) < 15:
                     if (
                         self.triggers_in_the_past_seven_min[camera] <= 4
                         or num_cameras_with_recent_triggers > 1
                     ):
-                        print(f'{camera} has {self.triggers_in_the_past_seven_min[camera]} triggers in the past 7d.')
-                        print(f'{num_cameras_with_recent_triggers} cameras are triggered right now.')
+                        print(
+                            f"{camera} has {self.triggers_in_the_past_seven_min[camera]} triggers in the past 7d."
+                        )
+                        print(
+                            f"{num_cameras_with_recent_triggers} cameras are triggered right now."
+                        )
 
                         age = now - self.last_trigger_timestamp[camera]
                         priority = self.choose_priority(camera, int(age))
-                        print(f'*** CAMERA TRIGGER (hidden/{camera}.html @ {priority}) ***')
+                        print(
+                            f"*** CAMERA TRIGGER (hidden/{camera}.html @ {priority}) ***"
+                        )
                         triggers.append(
                             (
                                 f"hidden/unwrapped_{camera}.html",
@@ -101,14 +111,16 @@ class any_camera_trigger(trigger.trigger):
                             )
                         )
                     else:
-                        logger.info(f'{camera} is too spammy; {self.triggers_in_the_past_seven_min[camera]} events in the past 7m.  Ignoring it.')
-        except Exception as e:
-            logger.exception(e)
+                        logger.info(
+                            f"{camera} is too spammy; {self.triggers_in_the_past_seven_min[camera]} events in the past 7m.  Ignoring it."
+                        )
+        except Exception:
+            logger.exception()
 
         if len(triggers) == 0:
             return None
         else:
-            logger.info('There are active camera triggers!')
+            logger.info("There are active camera triggers!")
             return triggers