mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-11 09:49:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ngx_log_error() > ngx_conf_log_error()

Browse Source
This commit is contained in:
Igor Sysoev 2007-02-20 15:47:54 +00:00
parent bb4c112fe5
commit 40460bab8d
1 changed files with 27 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/core/ngx_conf_file.c
View File

@ -154,10 +154,8 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
} }
if (rc == NGX_CONF_FILE_DONE && block) { if (rc == NGX_CONF_FILE_DONE && block) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected end of file in %s:%ui, expecting \"}\"", "unexpected end of file, expecting \"}\"");
cf->conf_file->file.name.data,
cf->conf_file->line);
goto failed; goto failed;
} }
@ -181,10 +179,7 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename)
goto failed; goto failed;
} }
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, rv);
"%s in %s:%ui",
rv, cf->conf_file->file.name.data,
cf->conf_file->line);
goto failed; goto failed;
} }
@ -275,20 +270,16 @@ ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last)
} }
if (!(cmd->type & NGX_CONF_BLOCK) && last != NGX_OK) { if (!(cmd->type & NGX_CONF_BLOCK) && last != NGX_OK) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"directive \"%s\" in %s:%ui " "directive \"%s\" is not terminated by \";\"",
"is not terminated by \";\"", name->data);
name->data, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
if ((cmd->type & NGX_CONF_BLOCK) && last != NGX_CONF_BLOCK_START) { if ((cmd->type & NGX_CONF_BLOCK) && last != NGX_CONF_BLOCK_START) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"directive \"%s\" in %s:%ui " "directive \"%s\" has no opening \"{\"",
"has not the opening \"{\"", name->data);
name->data, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
@ -352,40 +343,31 @@ ngx_conf_handler(ngx_conf_t *cf, ngx_int_t last)
return NGX_ERROR; return NGX_ERROR;
} }
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"the \"%s\" directive %s in %s:%ui", "the \"%s\" directive %s", name->data, rv);
name->data, rv, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
} }
if (multi == 0) { if (multi == 0) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unknown directive \"%s\" in %s:%ui", "unknown directive \"%s\"", name->data);
name->data, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
not_allowed: not_allowed:
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"directive \"%s\" in %s:%ui " "directive \"%s\" is not allowed here", name->data);
"is not allowed here",
name->data, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
invalid: invalid:
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"invalid number arguments in " "invalid number arguments in directive \"%s\"",
"directive \"%s\" in %s:%ui", name->data);
name->data, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
@ -420,11 +402,9 @@ ngx_conf_read_token(ngx_conf_t *cf)
>= ngx_file_size(&cf->conf_file->file.info)) >= ngx_file_size(&cf->conf_file->file.info))
{ {
if (cf->args->nelts > 0) { if (cf->args->nelts > 0) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected end of file in %s:%ui, " "unexpected end of file, "
"expecting \";\" or \"}\"", "expecting \";\" or \"}\"");
cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
@ -488,11 +468,8 @@ ngx_conf_read_token(ngx_conf_t *cf)
need_space = 0; need_space = 0;
} else { } else {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected \"%c\" in %s:%ui", "unexpected \"%c\"", ch);
ch, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
} }
@ -509,10 +486,8 @@ ngx_conf_read_token(ngx_conf_t *cf)
case ';': case ';':
case '{': case '{':
if (cf->args->nelts == 0) { if (cf->args->nelts == 0) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected \"%c\" in %s:%ui", "unexpected \"%c\"", ch);
ch, cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }
@ -524,10 +499,8 @@ ngx_conf_read_token(ngx_conf_t *cf)
case '}': case '}':
if (cf->args->nelts != 0) { if (cf->args->nelts != 0) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected \"}\" in %s:%ui", "unexpected \"}\"");
cf->conf_file->file.name.data,
cf->conf_file->line);
return NGX_ERROR; return NGX_ERROR;
} }