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

Fix bug

Browse Source
This commit is contained in:
Nick Mowen 2022-09-25 11:16:36 -06:00
parent 46ec2c77dd
commit aa48e7f054
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frigate/storage.py
View File

@ -30,9 +30,6 @@ class StorageMaintainer(threading.Thread):
total_avg_hour = 0.0 total_avg_hour = 0.0
for camera in self.config.cameras.keys(): for camera in self.config.cameras.keys():
if not self.config.cameras[camera].record.enabled:
continue
# get average of non-zero segment sizes to ignore segment with no value # get average of non-zero segment sizes to ignore segment with no value
avg_segment_size = round( avg_segment_size = round(
Recordings.select(fn.AVG(Recordings.segment_size)) Recordings.select(fn.AVG(Recordings.segment_size))
@ -54,12 +51,12 @@ class StorageMaintainer(threading.Thread):
total_avg_hour += avg_hour_size total_avg_hour += avg_hour_size
self.avg_segment_sizes[camera] = { self.avg_segment_sizes[camera] = {
"segment": avg_segment_size, "segment": avg_segment_size,
"segment_duration": segment_duration,
"hour": avg_hour_size, "hour": avg_hour_size,
} }
self.avg_segment_sizes["total"] = { self.avg_segment_sizes["total"] = {
"segment": total_avg_segment, "segment": total_avg_segment,
"segment_duration": segment_duration,
"hour": total_avg_hour, "hour": total_avg_hour,
} }
@ -103,7 +100,7 @@ class StorageMaintainer(threading.Thread):
deleted_recordings = set() deleted_recordings = set()
for recording in recordings.objects().iterator(): for recording in recordings.objects().iterator():
# 2 hours of recordings have been deleted, no need to delete any more # 2 hours of recordings have been deleted, no need to delete any more
if deleted_recordings >= segment_count: if len(deleted_recordings) >= segment_count:
break break
keep = False keep = False
@ -151,15 +148,15 @@ class StorageMaintainer(threading.Thread):
def run(self): def run(self):
# Check storage consumption every 5 minutes # Check storage consumption every 5 minutes
while not self.stop_event.wait(300): while not self.stop_event.wait(20):
if not self.avg_segment_sizes: if not self.avg_segment_sizes:
self.calculate_camera_segment_sizes() self.calculate_camera_segment_sizes()
logger.error(f"Default camera segment sizes: {self.avg_segment_sizes}") logger.debug(f"Default camera segment sizes: {self.avg_segment_sizes}")
needs_cleanup = self.check_storage_needs_cleanup() needs_cleanup = self.check_storage_needs_cleanup()
logger.error(f"needs cleanup: {needs_cleanup}") logger.debug(f"needs cleanup: {needs_cleanup}")
if needs_cleanup: if needs_cleanup:
self.reduce_storage_consumption() self.reduce_storage_consumption()