Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed log levels of configuration parsing errors.

Browse source 
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".
This commit is contained in:
Valentin Bartenev 2016-09-20 15:07:16 +03:00
parent d0c13e8c8c
commit 92578d6888
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/ngx_conf_file.c
View file

@ -1336,7 +1336,7 @@ ngx_conf_set_enum_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_OK; 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); "invalid value \"%s\"", value[1].data);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
@ -1378,7 +1378,7 @@ ngx_conf_set_bitmask_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
} }
if (mask[m].name.len == 0) { 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); "invalid value \"%s\"", value[i].data);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;

4
src/event/ngx_event_openssl.c
View file

@ -3656,13 +3656,13 @@ ngx_openssl_engine(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
engine = ENGINE_by_id((char *) value[1].data); engine = ENGINE_by_id((char *) value[1].data);
if (engine == NULL) { 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]); "ENGINE_by_id(\"%V\") failed", &value[1]);
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
if (ENGINE_set_default(engine, ENGINE_METHOD_ALL) == 0) { 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", "ENGINE_set_default(\"%V\", ENGINE_METHOD_ALL) failed",
&value[1]); &value[1]);

4
src/http/ngx_http_upstream.c
View file

@ -5717,14 +5717,14 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
} }
if ((uscfp[i]->flags & NGX_HTTP_UPSTREAM_CREATE) && !u->no_port) { 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", "upstream \"%V\" may not have port %d",
&u->host, u->port); &u->host, u->port);
return NULL; return NULL;
} }
if ((flags & NGX_HTTP_UPSTREAM_CREATE) && !uscfp[i]->no_port) { 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", "upstream \"%V\" may not have port %d in %s:%ui",
&u->host, uscfp[i]->port, &u->host, uscfp[i]->port,
uscfp[i]->file_name, uscfp[i]->line); uscfp[i]->file_name, uscfp[i]->line);

4
src/mail/ngx_mail_ssl_module.c
View file

@ -488,7 +488,7 @@ ngx_mail_ssl_enable(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
} }
if (scf->enable && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { 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\""); "\"starttls\" directive conflicts with \"ssl on\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
@ -514,7 +514,7 @@ ngx_mail_ssl_starttls(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
} }
if (scf->enable == 1 && (ngx_int_t) scf->starttls > NGX_MAIL_STARTTLS_OFF) { 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\""); "\"ssl\" directive conflicts with \"starttls\"");
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }

4
src/stream/ngx_stream_upstream.c
View file

@ -586,14 +586,14 @@ ngx_stream_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
} }
if ((uscfp[i]->flags & NGX_STREAM_UPSTREAM_CREATE) && !u->no_port) { 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", "upstream \"%V\" may not have port %d",
&u->host, u->port); &u->host, u->port);
return NULL; return NULL;
} }
if ((flags & NGX_STREAM_UPSTREAM_CREATE) && !uscfp[i]->no_port) { 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", "upstream \"%V\" may not have port %d in %s:%ui",
&u->host, uscfp[i]->port, &u->host, uscfp[i]->port,
uscfp[i]->file_name, uscfp[i]->line); uscfp[i]->file_name, uscfp[i]->line);