Mercurial > hg > nginx

changeset 5250:3bb51e5afa9e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: moved initialization of log level. 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().
author Vladimir Homutov <vl@nginx.com>
date Thu, 13 Jun 2013 14:50:10 +0400
parents 725fb71ab1a6
children 4ef49081ef4c
files src/core/ngx_cycle.c src/core/ngx_log.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -84,7 +84,6 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
 
     cycle->pool = pool;
     cycle->log = log;
-    cycle->new_log.log_level = NGX_LOG_ERR;
     cycle->old_cycle = old_cycle;
 
     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) {
             goto failed;
         }
+
+        cycle->new_log.log_level = NGX_LOG_ERR;
     }
 
     /* open the new files */
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -454,7 +454,5 @@ ngx_error_log(ngx_conf_t *cf, ngx_comman
         return NGX_CONF_OK;
     }
 
-    cf->cycle->new_log.log_level = 0;
-
     return ngx_log_set_levels(cf, &cf->cycle->new_log);
 }