revert the previous commit and r2447 change in src/core/ngx_cycle.c

diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c
index 55d7c2d4845c1568b21e9c53ca83de3b64aae6f3..aa0d9ce7ed7711f53d0265a7d843c4797697ec49 100644 (file)
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -168,7 +168,6 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
         return NULL;
     }
 
-    cycle->new_log->log_level = NGX_LOG_ERR;
     cycle->new_log->file->name = error_log;
 
 
@@ -395,6 +394,10 @@ ngx_init_cycle(ngx_cycle_t *old_cycle)
     cycle->log = cycle->new_log;
     pool->log = cycle->new_log;
 
+    if (cycle->log->log_level == 0) {
+        cycle->log->log_level = NGX_LOG_ERR;
+    }
+
 
     /* create shared memory */