mirror/docker-mailserver.docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2025-07-22 19:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chore: Avoid logging a warning when LOG_LEVEL is unset

Browse source
This commit is contained in:
Brennan Kinney 2025-06-01 13:42:21 +12:00 • committed by GitHub
parent ea03808c8f
commit edb236f355
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
target/scripts/startup/variables-stack.sh
View file

@ -153,7 +153,6 @@ function __environment_variables_general_setup() {
VARS[FETCHMAIL_PARALLEL]="${FETCHMAIL_PARALLEL:=0}" VARS[FETCHMAIL_PARALLEL]="${FETCHMAIL_PARALLEL:=0}"
VARS[FETCHMAIL_POLL]="${FETCHMAIL_POLL:=300}" VARS[FETCHMAIL_POLL]="${FETCHMAIL_POLL:=300}"
VARS[GETMAIL_POLL]="${GETMAIL_POLL:=5}" VARS[GETMAIL_POLL]="${GETMAIL_POLL:=5}"
VARS[LOG_LEVEL]="${LOG_LEVEL:=info}"
VARS[LOGROTATE_INTERVAL]="${LOGROTATE_INTERVAL:=weekly}" VARS[LOGROTATE_INTERVAL]="${LOGROTATE_INTERVAL:=weekly}"
VARS[LOGROTATE_COUNT]="${LOGROTATE_COUNT:=4}" VARS[LOGROTATE_COUNT]="${LOGROTATE_COUNT:=4}"
VARS[LOGWATCH_INTERVAL]="${LOGWATCH_INTERVAL:=none}" VARS[LOGWATCH_INTERVAL]="${LOGWATCH_INTERVAL:=none}"
@ -181,21 +180,12 @@ function __environment_variables_general_setup() {
fi fi
} }
# `LOG_LEVEL` must be set early to correctly filter calls to `scripts/helpers/log.sh:_log()`
function __environment_variables_log_level() { function __environment_variables_log_level() {
if [[ ${LOG_LEVEL} == 'trace' ]] \ VARS[LOG_LEVEL]="${LOG_LEVEL:=info}"
|| [[ ${LOG_LEVEL} == 'debug' ]] \
|| [[ ${LOG_LEVEL} == 'info' ]] \
|| [[ ${LOG_LEVEL} == 'warn' ]] \
|| [[ ${LOG_LEVEL} == 'error' ]]
then
return 0
else
local DEFAULT_LOG_LEVEL='info'
_log 'warn' "Log level '${LOG_LEVEL}' is invalid (falling back to default '${DEFAULT_LOG_LEVEL}')"
# shellcheck disable=SC2034 if [[ ! ${LOG_LEVEL} =~ ^(trace|debug|info|warn|error)$ ]]; then
VARS[LOG_LEVEL]="${DEFAULT_LOG_LEVEL}" _log 'warn' "Log level '${LOG_LEVEL}' is invalid (falling back to default: 'info')"
LOG_LEVEL="${DEFAULT_LOG_LEVEL}"
fi fi
} }