details: http://hg.nginx.org/nginx/rev/9cf2dce316e5
branches:
changeset: 6699:9cf2dce316e5
user: Valentin Bartenev <vbart@nginx.com>
date: Tue Sep 20 15:07:16 2016 +0300
description:
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".

diffstat:

src/core/ngx_conf_file.c | 4 ++--
src/event/ngx_event_openssl.c | 4 ++--
src/http/ngx_http_upstream.c | 4 ++--
src/mail/ngx_mail_ssl_module.c | 4 ++--
src/stream/ngx_stream_upstream.c | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)

diffs (101 lines):

diff -r e8d4c9e9682a -r 9cf2dce316e5 src/core/ngx_conf_file.c
--- 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 @@ ngx_conf_set_enum_slot(ngx_conf_t *cf, n
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 @@ ngx_conf_set_bitmask_slot(ngx_conf_t *cf
}

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;
diff -r e8d4c9e9682a -r 9cf2dce316e5 src/event/ngx_event_openssl.c
--- 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 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_c
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]);

diff -r e8d4c9e9682a -r 9cf2dce316e5 src/http/ngx_http_upstream.c
--- 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 @@ ngx_http_upstream_add(ngx_conf_t *cf, ng
}

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);
diff -r e8d4c9e9682a -r 9cf2dce316e5 src/mail/ngx_mail_ssl_module.c
--- 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 @@ ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_
}

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 @@ ngx_mail_ssl_starttls(ngx_conf_t *cf, ng
}

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;
}
diff -r e8d4c9e9682a -r 9cf2dce316e5 src/stream/ngx_stream_upstream.c
--- 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 @@ ngx_stream_upstream_add(ngx_conf_t *cf,
}

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);

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel