diff --git a/backend/logger/formatter.py b/backend/logger/formatter.py index b6b93afbf..2172c4b6d 100644 --- a/backend/logger/formatter.py +++ b/backend/logger/formatter.py @@ -3,7 +3,7 @@ from pprint import pformat from colorama import Fore, Style, init -from config import FORCE_COLOR, NO_COLOR +from config import FORCE_COLOR, LOGLEVEL, NO_COLOR RED = Fore.RED LIGHTRED = Fore.LIGHTRED_EX @@ -33,16 +33,16 @@ LOGGING_CONFIG = { }, "root": { "handlers": ["default"], - "level": "INFO", + "level": LOGLEVEL, }, "loggers": { "uvicorn": { - "level": "INFO", + "level": LOGLEVEL, "handlers": ["default"], "propagate": False, }, "uvicorn.error": { - "level": "INFO", + "level": LOGLEVEL, "handlers": ["default"], "propagate": False, }, diff --git a/docker/init_scripts/docker-entrypoint.sh b/docker/init_scripts/docker-entrypoint.sh index 71d3e8373..af504d9ac 100755 --- a/docker/init_scripts/docker-entrypoint.sh +++ b/docker/init_scripts/docker-entrypoint.sh @@ -39,6 +39,16 @@ done export ROMM_BASE_PATH=${ROMM_BASE_PATH:-/romm} export ROMM_PORT=${ROMM_PORT:-8080} +# Disable nginx access logs when log level is WARNING, ERROR, or CRITICAL +case "${LOGLEVEL:-INFO}" in + WARNING|ERROR|CRITICAL|warning|error|critical) + export NGINX_ACCESS_LOG="access_log off;" + ;; + *) + export NGINX_ACCESS_LOG="" + ;; +esac + # Set IPV6_LISTEN based on IPV4_ONLY if [[ ${IPV4_ONLY} == "true" ]]; then export IPV6_LISTEN="#listen [::]:${ROMM_PORT};" diff --git a/docker/init_scripts/init b/docker/init_scripts/init index f9d493160..f6ea88f6f 100755 --- a/docker/init_scripts/init +++ b/docker/init_scripts/init @@ -93,6 +93,48 @@ start_bin_gunicorn() { # cleanup potentially leftover socket rm /tmp/gunicorn.sock -f + # Generate gunicorn logging config with the configured log level + cat >/etc/gunicorn/logging.conf <