ensure disabled cameras dont break shutdown

This commit is contained in:
Blake Blackshear 2024-06-06 17:34:57 -05:00
parent 17b175a89f
commit bd5e8924d9

View File

@ -743,19 +743,21 @@ class FrigateApp:
# ensure the capture processes are done # ensure the capture processes are done
for camera in self.camera_metrics.keys(): for camera in self.camera_metrics.keys():
capture_process = self.camera_metrics[camera]["capture_process"] capture_process = self.camera_metrics[camera]["capture_process"]
logger.info(f"Waiting for capture process for {camera} to stop") if capture_process is not None:
capture_process.terminate() logger.info(f"Waiting for capture process for {camera} to stop")
capture_process.join() capture_process.terminate()
capture_process.join()
# ensure the camera processors are done # ensure the camera processors are done
for camera in self.camera_metrics.keys(): for camera in self.camera_metrics.keys():
camera_process = self.camera_metrics[camera]["process"] camera_process = self.camera_metrics[camera]["process"]
logger.info(f"Waiting for process for {camera} to stop") if camera_process is not None:
camera_process.terminate() logger.info(f"Waiting for process for {camera} to stop")
camera_process.join() camera_process.terminate()
logger.info(f"Closing frame queue for {camera}") camera_process.join()
frame_queue = self.camera_metrics[camera]["frame_queue"] logger.info(f"Closing frame queue for {camera}")
empty_and_close_queue(frame_queue) frame_queue = self.camera_metrics[camera]["frame_queue"]
empty_and_close_queue(frame_queue)
# ensure the detectors are done # ensure the detectors are done
for detector in self.detectors.values(): for detector in self.detectors.values():