administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-05-01 19:17:41 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Stop camera processes when stop command is sent

Browse Source
This commit is contained in:
Nicolas Mowen 2025-06-10 15:55:49 -06:00
parent 985a447074
commit f5b3f9ae87
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
frigate/camera/maintainer.py
View File

@ -153,6 +153,23 @@ class CameraMaintainer(threading.Thread):
capture_process.start() capture_process.start()
logger.info(f"Capture process started for {name}: {capture_process.pid}") logger.info(f"Capture process started for {name}: {capture_process.pid}")
def __stop_camera_capture_process(self, camera: str) -> None:
capture_process = self.camera_metrics[camera].capture_process
if capture_process is not None:
logger.info(f"Waiting for capture process for {camera} to stop")
capture_process.terminate()
capture_process.join()
def __stop_camera_process(self, camera: str) -> None:
metrics = self.camera_metrics[camera]
camera_process = metrics.process
if camera_process is not None:
logger.info(f"Waiting for process for {camera} to stop")
camera_process.terminate()
camera_process.join()
logger.info(f"Closing frame queue for {camera}")
empty_and_close_queue(metrics.frame_queue)
def run(self): def run(self):
self.__init_historical_regions() self.__init_historical_regions()
@ -169,24 +186,18 @@ class CameraMaintainer(threading.Thread):
elif update_type == GlobalConfigUpdateEnum.debug_camera: elif update_type == GlobalConfigUpdateEnum.debug_camera:
pass pass
elif update_type == GlobalConfigUpdateEnum.remove_camera: elif update_type == GlobalConfigUpdateEnum.remove_camera:
pass camera = update_payload.get("camera")
if camera:
self.__stop_camera_capture_process(camera)
self.__stop_camera_process(camera)
# ensure the capture processes are done # ensure the capture processes are done
for camera, metrics in self.camera_metrics.items(): for camera in self.camera_metrics.keys():
capture_process = metrics.capture_process self.__stop_camera_capture_process(camera)
if capture_process is not None:
logger.info(f"Waiting for capture process for {camera} to stop")
capture_process.terminate()
capture_process.join()
# ensure the camera processors are done # ensure the camera processors are done
for camera, metrics in self.camera_metrics.items(): for camera in self.camera_metrics.keys():
camera_process = metrics.process self.__stop_camera_process(camera)
if camera_process is not None:
logger.info(f"Waiting for process for {camera} to stop")
camera_process.terminate()
camera_process.join()
logger.info(f"Closing frame queue for {camera}")
empty_and_close_queue(metrics.frame_queue)
self.frame_manager.cleanup() self.frame_manager.cleanup()