From f42a20d3db0acd7c3338c02f05df7535076555f8 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Tue, 9 Jul 2024 16:54:16 -0600 Subject: [PATCH] Don't fail on cleanup --- frigate/util/image.py | 9 ++------- frigate/video.py | 1 - 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/frigate/util/image.py b/frigate/util/image.py index 5c50cafde..7c470a2a0 100644 --- a/frigate/util/image.py +++ b/frigate/util/image.py @@ -1,7 +1,6 @@ """Utilities for creating and manipulating image frames.""" import datetime -import inspect import logging import subprocess as sp from abc import ABC, abstractmethod @@ -696,7 +695,6 @@ class SharedMemoryFrameManager(FrameManager): return shm.buf def get(self, name: str, shape) -> Optional[np.ndarray]: - logger.info(f"retrieving {name} from {inspect.stack()[1].filename} {inspect.stack()[1].function}") try: if name in self.shm_store: shm = self.shm_store[name] @@ -708,13 +706,11 @@ class SharedMemoryFrameManager(FrameManager): return None def close(self, name: str): - logger.info(f"closing {name}") if name in self.shm_store: self.shm_store[name].close() del self.shm_store[name] def delete(self, name: str): - logger.info(f"deleting expired {name}") if name in self.shm_store: self.shm_store[name].close() @@ -725,10 +721,9 @@ class SharedMemoryFrameManager(FrameManager): del self.shm_store[name] else: - shm = shared_memory.SharedMemory(name=name) - shm.close() - try: + shm = shared_memory.SharedMemory(name=name) + shm.close() shm.unlink() except FileNotFoundError: pass diff --git a/frigate/video.py b/frigate/video.py index 97ace7d79..aaea05d43 100755 --- a/frigate/video.py +++ b/frigate/video.py @@ -131,7 +131,6 @@ def capture_frames( logger.error(f"something video bad happened :: {e}") frame_manager.delete(frame_name) - # shutdown has been initiated if stop_event.is_set(): break