# HG changeset patch # User Maxim Dounin # Date 1719345516 -10800 # Node ID 14770557be170c456ea40731de068a8e91b79e0d # Parent e1f15d47d10292c6b04cbd0160c01474f5688e16 Core: simplified log levels matching. diff -r e1f15d47d102 -r 14770557be17 src/core/ngx_log.c --- a/src/core/ngx_log.c Tue Jun 25 22:58:11 2024 +0300 +++ b/src/core/ngx_log.c Tue Jun 25 22:58:36 2024 +0300 @@ -613,18 +613,12 @@ static char * ngx_log_set_levels(ngx_conf_t *cf, ngx_log_t *log) { - ngx_uint_t i, n, d, found; + ngx_uint_t i, n, d; ngx_str_t *value; - if (cf->args->nelts == 2) { - log->log_level = NGX_LOG_ERR; - return NGX_CONF_OK; - } - value = cf->args->elts; for (i = 2; i < cf->args->nelts; i++) { - found = 0; for (n = 1; n <= NGX_LOG_DEBUG; n++) { if (ngx_strcmp(value[i].data, err_levels[n].data) == 0) { @@ -637,8 +631,7 @@ } log->log_level = n; - found = 1; - break; + goto next; } } @@ -652,17 +645,21 @@ } log->log_level |= d; - found = 1; - break; + goto next; } } + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "invalid log level \"%V\"", &value[i]); + return NGX_CONF_ERROR; - if (!found) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "invalid log level \"%V\"", &value[i]); - return NGX_CONF_ERROR; - } + next: + + continue; + } + + if (log->log_level == 0) { + log->log_level = NGX_LOG_ERR; } if (log->log_level == NGX_LOG_DEBUG) {