# HG changeset patch
# User Vladimir Homutov <vl@nginx.com>
# Date 1371120610 -14400
# Node ID 3bb51e5afa9ec9e8dc89e7d13b3312a3b3fa4d2b
# Parent  725fb71ab1a60bd48b0afb8b001b5349f5054cb1
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().

diff -r 725fb71ab1a6 -r 3bb51e5afa9e src/core/ngx_cycle.c
--- a/src/core/ngx_cycle.c	Fri Jun 07 13:16:00 2013 -0700
+++ b/src/core/ngx_cycle.c	Thu Jun 13 14:50:10 2013 +0400
@@ -84,7 +84,6 @@
 
     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 @@
         if (cycle->new_log.file == NULL) {
             goto failed;
         }
+
+        cycle->new_log.log_level = NGX_LOG_ERR;
     }
 
     /* open the new files */
diff -r 725fb71ab1a6 -r 3bb51e5afa9e src/core/ngx_log.c
--- a/src/core/ngx_log.c	Fri Jun 07 13:16:00 2013 -0700
+++ b/src/core/ngx_log.c	Thu Jun 13 14:50:10 2013 +0400
@@ -454,7 +454,5 @@
         return NGX_CONF_OK;
     }
 
-    cf->cycle->new_log.log_level = 0;
-
     return ngx_log_set_levels(cf, &cf->cycle->new_log);
 }