administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-14 23:25:25 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Don't fail on cleanup

Browse Source
This commit is contained in:
Nicolas Mowen 2024-07-09 16:54:16 -06:00
parent f5d889f364
commit f42a20d3db
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frigate/util/image.py
View File

@ -1,7 +1,6 @@
"""Utilities for creating and manipulating image frames.""" """Utilities for creating and manipulating image frames."""
import datetime import datetime
import inspect
import logging import logging
import subprocess as sp import subprocess as sp
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
@ -696,7 +695,6 @@ class SharedMemoryFrameManager(FrameManager):
return shm.buf return shm.buf
def get(self, name: str, shape) -> Optional[np.ndarray]: def get(self, name: str, shape) -> Optional[np.ndarray]:
logger.info(f"retrieving {name} from {inspect.stack()[1].filename} {inspect.stack()[1].function}")
try: try:
if name in self.shm_store: if name in self.shm_store:
shm = self.shm_store[name] shm = self.shm_store[name]
@ -708,13 +706,11 @@ class SharedMemoryFrameManager(FrameManager):
return None return None
def close(self, name: str): def close(self, name: str):
logger.info(f"closing {name}")
if name in self.shm_store: if name in self.shm_store:
self.shm_store[name].close() self.shm_store[name].close()
del self.shm_store[name] del self.shm_store[name]
def delete(self, name: str): def delete(self, name: str):
logger.info(f"deleting expired {name}")
if name in self.shm_store: if name in self.shm_store:
self.shm_store[name].close() self.shm_store[name].close()
@ -725,10 +721,9 @@ class SharedMemoryFrameManager(FrameManager):
del self.shm_store[name] del self.shm_store[name]
else: else:
try:
shm = shared_memory.SharedMemory(name=name) shm = shared_memory.SharedMemory(name=name)
shm.close() shm.close()
try:
shm.unlink() shm.unlink()
except FileNotFoundError: except FileNotFoundError:
pass pass

1
frigate/video.py
View File

@ -131,7 +131,6 @@ def capture_frames(
logger.error(f"something video bad happened :: {e}") logger.error(f"something video bad happened :: {e}")
frame_manager.delete(frame_name) frame_manager.delete(frame_name)
# shutdown has been initiated # shutdown has been initiated
if stop_event.is_set(): if stop_event.is_set():
break break