Mercurial > hg > nginx
changeset 6699:9cf2dce316e5
Fixed log levels of configuration parsing errors.
All the errors that prevent loading configuration must be printed on the "emerg"
log level. Previously, nginx might silently fail to load configuration in some
cases as the default log level is "error".
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Tue, 20 Sep 2016 15:07:16 +0300 |
| parents | e8d4c9e9682a |
| children | 0d2956dfc4e6 |
| files | src/core/ngx_conf_file.c src/event/ngx_event_openssl.c src/http/ngx_http_upstream.c src/mail/ngx_mail_ssl_module.c src/stream/ngx_stream_upstream.c |
| diffstat | 5 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c Tue Sep 20 12:30:52 2016 +0300 +++ b/src/core/ngx_conf_file.c Tue Sep 20 15:07:16 2016 +0300 @@ -1336,7 +1336,7 @@ return NGX_CONF_OK; } - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid value \"%s\"", value[1].data); return NGX_CONF_ERROR; @@ -1378,7 +1378,7 @@ } if (mask[m].name.len == 0) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid value \"%s\"", value[i].data); return NGX_CONF_ERROR;
--- a/src/event/ngx_event_openssl.c Tue Sep 20 12:30:52 2016 +0300 +++ b/src/event/ngx_event_openssl.c Tue Sep 20 15:07:16 2016 +0300 @@ -3656,13 +3656,13 @@ engine = ENGINE_by_id((char *) value[1].data); if (engine == NULL) { - ngx_ssl_error(NGX_LOG_WARN, cf->log, 0, + ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, "ENGINE_by_id(\"%V\") failed", &value[1]); return NGX_CONF_ERROR; } if (ENGINE_set_default(engine, ENGINE_METHOD_ALL) == 0) { - ngx_ssl_error(NGX_LOG_WARN, cf->log, 0, + ngx_ssl_error(NGX_LOG_EMERG, cf->log, 0, "ENGINE_set_default(\"%V\", ENGINE_METHOD_ALL) failed", &value[1]);
--- a/src/http/ngx_http_upstream.c Tue Sep 20 12:30:52 2016 +0300 +++ b/src/http/ngx_http_upstream.c Tue Sep 20 15:07:16 2016 +0300 @@ -5717,14 +5717,14 @@ } if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && !u->no_port) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "upstream \"%V\" may not have port %d", &u->host, u->port); return NULL; } if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) { - ngx_log_error(NGX_LOG_WARN, cf->log, 0, + ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "upstream \"%V\" may not have port %d in %s:%ui", &u->host, uscfp[i]->port, uscfp[i]->file_name, uscfp[i]->line);
--- a/src/mail/ngx_mail_ssl_module.c Tue Sep 20 12:30:52 2016 +0300 +++ b/src/mail/ngx_mail_ssl_module.c Tue Sep 20 15:07:16 2016 +0300 @@ -488,7 +488,7 @@ } if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "\"starttls\" directive conflicts with \"ssl on\""); return NGX_CONF_ERROR; } @@ -514,7 +514,7 @@ } if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "\"ssl\" directive conflicts with \"starttls\""); return NGX_CONF_ERROR; }
--- a/src/stream/ngx_stream_upstream.c Tue Sep 20 12:30:52 2016 +0300 +++ b/src/stream/ngx_stream_upstream.c Tue Sep 20 15:07:16 2016 +0300 @@ -586,14 +586,14 @@ } if ((uscfp[i]->flags & NGX_STREAM_UPSTREAM_CREATE) && !u->no_port) { - ngx_conf_log_error(NGX_LOG_WARN, cf, 0, + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "upstream \"%V\" may not have port %d", &u->host, u->port); return NULL; } if ((flags & NGX_STREAM_UPSTREAM_CREATE) && !uscfp[i]->no_port) { - ngx_log_error(NGX_LOG_WARN, cf->log, 0, + ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "upstream \"%V\" may not have port %d in %s:%ui", &u->host, uscfp[i]->port, uscfp[i]->file_name, uscfp[i]->line);