mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-06 06:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

*) do not show line number for -g option

Browse Source 
*) reset configuration file after -g option has been parsed
This commit is contained in:
Igor Sysoev 2009-04-28 20:06:03 +00:00
parent 9441ffadbe
commit ca6a9e0fdc
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/ngx_conf_file.c
View File

@ -61,6 +61,7 @@ static ngx_uint_t argument_number[] = {
char * char *
ngx_conf_param(ngx_conf_t *cf) ngx_conf_param(ngx_conf_t *cf)
{ {
char *rv;
ngx_str_t *param; ngx_str_t *param;
ngx_buf_t b; ngx_buf_t b;
ngx_conf_file_t conf_file; ngx_conf_file_t conf_file;
@ -82,13 +83,17 @@ ngx_conf_param(ngx_conf_t *cf)
b.temporary = 1; b.temporary = 1;
conf_file.file.fd = NGX_INVALID_FILE; conf_file.file.fd = NGX_INVALID_FILE;
conf_file.file.name.data = (u_char *) "command line"; conf_file.file.name.data = NULL;
conf_file.line = 1; conf_file.line = 0;
cf->conf_file = &conf_file; cf->conf_file = &conf_file;
cf->conf_file->buffer = &b; cf->conf_file->buffer = &b;
return ngx_conf_parse(cf, NULL); rv = ngx_conf_parse(cf, NULL);
cf->conf_file = NULL;
return rv;
} }
@ -973,6 +978,12 @@ ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, ngx_err_t err,
return; return;
} }
if (cf->conf_file->file.fd == NGX_INVALID_FILE) {
ngx_log_error(level, cf->log, 0, "%*s in command line",
p - errstr, errstr);
return;
}
ngx_log_error(level, cf->log, 0, "%*s in %s:%ui", ngx_log_error(level, cf->log, 0, "%*s in %s:%ui",
p - errstr, errstr, p - errstr, errstr,
cf->conf_file->file.name.data, cf->conf_file->line); cf->conf_file->file.name.data, cf->conf_file->line);