From 67bf3a4a7b12401426f874aabec770bc3c18430c Mon Sep 17 00:00:00 2001 From: Sergey Krashevich Date: Tue, 20 Jun 2023 00:06:32 +0300 Subject: [PATCH] Update nginx logging location if logger default is not warning, error, or critical --- frigate/app.py | 14 ++++++++++++++ frigate/http.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/frigate/app.py b/frigate/app.py index 9d85f461e..39bcb37d4 100644 --- a/frigate/app.py +++ b/frigate/app.py @@ -212,6 +212,19 @@ class FrigateApp: migrate_db.close() + def init_nginx_manager(self) -> None: + with open("/usr/local/nginx/conf/nginx.conf", "r") as f: + file_lines = f.readlines() + if self.config.logger.default not in ["warning", "error", "critical"]: + with open("/usr/local/nginx/conf/nginx.conf", "w") as f: + for line in file_lines: + if "access_log /dev/shm/logs/nginx/access_log main;" in line: + line = line.replace( + "access_log /dev/shm/logs/nginx/access_log main;", + "access_log /dev/stdout main;", + ) + f.write(line) + def init_go2rtc(self) -> None: for proc in psutil.process_iter(["pid", "name"]): if proc.info["name"] == "go2rtc": @@ -474,6 +487,7 @@ class FrigateApp: self.init_database() self.init_onvif() self.init_recording_manager() + self.init_nginx_manager() self.init_go2rtc() self.bind_database() self.init_dispatcher() diff --git a/frigate/http.py b/frigate/http.py index 57f140398..56502ccd0 100644 --- a/frigate/http.py +++ b/frigate/http.py @@ -1613,7 +1613,7 @@ def logs(service: str): "go2rtc": "/dev/shm/logs/go2rtc/current", "nginx": "/dev/shm/logs/nginx/error_log" if current_app.frigate_config.logger.default in ["warning", "error", "critical"] - else "/dev/shm/logs/nginx/access_log", + else "/dev/shm/logs/nginx/current", } service_location = log_locations.get(service)