diff --git a/frigate/app.py b/frigate/app.py index eaacd627f..c873d6049 100644 --- a/frigate/app.py +++ b/frigate/app.py @@ -29,6 +29,8 @@ from frigate.comms.mqtt import MqttClient from frigate.comms.webpush import WebPushClient from frigate.comms.ws import WebSocketClient from frigate.comms.zmq_proxy import ZmqProxy +from frigate.config.config import FrigateConfig +from frigate.config.logger import LogLevel from frigate.const import ( CACHE_DIR, CLIPS_DIR, @@ -91,7 +93,7 @@ class FrigateApp: self.ptz_metrics: dict[str, PTZMetrics] = {} self.processes: dict[str, int] = {} self.region_grids: dict[str, list[list[dict[str, int]]]] = {} - self.config = config + self.config: FrigateConfig = config def ensure_dirs(self) -> None: for d in [ @@ -567,6 +569,19 @@ class FrigateApp: def start(self) -> None: logger.info(f"Starting Frigate ({VERSION})") + # setup logging + logging.getLogger().setLevel(self.config.logger.default.value.upper()) + + log_levels = { + "werkzeug": LogLevel.error, + "ws4py": LogLevel.error, + "httpx": LogLevel.error, + **self.config.logger.logs, + } + + for log, level in log_levels.items(): + logging.getLogger(log).setLevel(level.value.upper()) + # Ensure global state. self.ensure_dirs() diff --git a/frigate/config/logger.py b/frigate/config/logger.py index 120642042..8b77067fe 100644 --- a/frigate/config/logger.py +++ b/frigate/config/logger.py @@ -1,8 +1,6 @@ -import logging from enum import Enum -from pydantic import Field, ValidationInfo, model_validator -from typing_extensions import Self +from pydantic import Field from .base import FrigateBaseModel @@ -22,17 +20,3 @@ class LoggerConfig(FrigateBaseModel): logs: dict[str, LogLevel] = Field( default_factory=dict, title="Log level for specified processes." ) - - @model_validator(mode="after") - def post_validation(self, info: ValidationInfo) -> Self: - if isinstance(info.context, dict) and info.context.get("install", False): - logging.getLogger().setLevel(self.default.value.upper()) - - log_levels = { - "werkzeug": LogLevel.error, - "ws4py": LogLevel.error, - **self.logs, - } - - for log, level in log_levels.items(): - logging.getLogger(log).setLevel(level.value.upper()) diff --git a/frigate/util/services.py b/frigate/util/services.py index 0a2c6d769..4c902ea8d 100644 --- a/frigate/util/services.py +++ b/frigate/util/services.py @@ -318,11 +318,6 @@ def get_intel_gpu_stats() -> dict[str, str]: if video_frame is not None: video[key].append(float(video_frame)) - for key in render.keys(): - print( - f"new way has {key} :: {round(((sum(render[key]) / len(render[key])) + (sum(video[key]) / len(video[key]))) / 2, 2)}% total" - ) - results["gpu"] = ( f"{round(((sum(render['global']) / len(render['global'])) + (sum(video['global']) / len(video['global']))) / 2, 2)}%" )