use s6 to shutdown frigate

blakeblackshear · Sep 18, 2021 · a943ac1 · a943ac1
1 parent 96319e7
commit a943ac1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/frigate/util.py b/frigate/util.py
@@ -18,6 +18,7 @@
 import matplotlib.pyplot as plt
 import numpy as np
 import os
+import psutil
 
 logger = logging.getLogger(__name__)
 
@@ -534,7 +535,13 @@ def clipped(obj, frame_shape):
 
 
 def restart_frigate():
-    os.kill(os.getpid(), signal.SIGTERM)
+    proc = psutil.Process(1)
+    # if this is running via s6, sigterm pid 1
+    if proc.name() == "s6-svscan":
+        proc.terminate()
+    # otherwise, just try and exit frigate
+    else:
+        os.kill(os.getpid(), signal.SIGTERM)
 
 
 class EventsPerSecond:

diff --git a/frigate/watchdog.py b/frigate/watchdog.py
@@ -5,6 +5,10 @@
 import os
 import signal
 
+from frigate.util import (
+    restart_frigate,
+)
+
 logger = logging.getLogger(__name__)
 
 
@@ -30,6 +34,6 @@ def run(self):
                     detector.start_or_restart()
                 elif not detector.detect_process.is_alive():
                     logger.info("Detection appears to have stopped. Exiting frigate...")
-                    os.kill(os.getpid(), signal.SIGTERM)
+                    restart_frigate()
 
         logger.info(f"Exiting watchdog...")