chore: Avoid logging a warning when LOG_LEVEL is unset (#4497)

This commit is contained in:
Brennan Kinney 2025-06-02 17:01:00 +12:00 committed by GitHub
parent ea03808c8f
commit 8fa6e6deba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -4,7 +4,7 @@
declare -A VARS declare -A VARS
function _early_variables_setup() { function _early_variables_setup() {
__environment_variables_log_level __ensure_valid_log_level
__environment_variables_from_files __environment_variables_from_files
_obtain_hostname_and_domainname _obtain_hostname_and_domainname
__environment_variables_backwards_compatibility __environment_variables_backwards_compatibility
@ -181,21 +181,11 @@ function __environment_variables_general_setup() {
fi fi
} }
function __environment_variables_log_level() { # `LOG_LEVEL` must be set early to correctly filter calls to `scripts/helpers/log.sh:_log()`
if [[ ${LOG_LEVEL} == 'trace' ]] \ function __ensure_valid_log_level() {
|| [[ ${LOG_LEVEL} == 'debug' ]] \ if [[ ! ${LOG_LEVEL:-info} =~ ^(trace|debug|info|warn|error)$ ]]; then
|| [[ ${LOG_LEVEL} == 'info' ]] \ _log 'warn' "Log level '${LOG_LEVEL}' is invalid (falling back to default: 'info')"
|| [[ ${LOG_LEVEL} == 'warn' ]] \ LOG_LEVEL='info'
|| [[ ${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
VARS[LOG_LEVEL]="${DEFAULT_LOG_LEVEL}"
LOG_LEVEL="${DEFAULT_LOG_LEVEL}"
fi fi
} }