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

Core: moved initialization of log level.

Browse Source 
The cycle->new_log->log_level should only be initialized by ngx_init_cycle()
if no error logs were found in the configuration.  This move allows to get rid
of extra initialization in ngx_error_log().
This commit is contained in:
Vladimir Homutov 2013-06-13 14:50:10 +04:00
parent de2ec2c650
commit aac7f7f464
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/ngx_cycle.c
View File

@ -84,7 +84,6 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
cycle->pool = pool; cycle->pool = pool;
cycle->log = log; cycle->log = log;
cycle->new_log.log_level = NGX_LOG_ERR;
cycle->old_cycle = old_cycle; cycle->old_cycle = old_cycle;
cycle->conf_prefix.len = old_cycle->conf_prefix.len; cycle->conf_prefix.len = old_cycle->conf_prefix.len;
@ -344,6 +343,8 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
if (cycle->new_log.file == NULL) { if (cycle->new_log.file == NULL) {
goto failed; goto failed;
} }
cycle->new_log.log_level = NGX_LOG_ERR;
} }
/* open the new files */ /* open the new files */

2
src/core/ngx_log.c
View File

@ -454,7 +454,5 @@ ngx_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_OK; return NGX_CONF_OK;
} }
cf->cycle->new_log.log_level = 0;
return ngx_log_set_levels(cf, &cf->cycle->new_log); return ngx_log_set_levels(cf, &cf->cycle->new_log);
} }