]> git.kaiwu.me - nginx.git/commitdiff
set the error level as default http error_log level
authorIgor Sysoev <igor@sysoev.ru>
Fri, 16 Jan 2009 14:00:05 +0000 (14:00 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Fri, 16 Jan 2009 14:00:05 +0000 (14:00 +0000)
src/core/ngx_cycle.c
src/core/ngx_log.c

index aa0d9ce7ed7711f53d0265a7d843c4797697ec49..cdebf5645bffc75e6217a92cfb822d0c79a2dc23 100644 (file)
@@ -394,10 +394,6 @@ 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 */
 
index cc38b02da1d60a678d948ea7eb67a86b65a3879c..a9221db6e35f12f156a0eaf888f622a33a6dfc25 100644 (file)
@@ -302,7 +302,10 @@ ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log)
         }
     }
 
-    if (log->log_level == NGX_LOG_DEBUG) {
+    if (log->log_level == 0) {
+        log->log_level = NGX_LOG_ERR;
+
+    } else if (log->log_level == NGX_LOG_DEBUG) {
         log->log_level = NGX_LOG_DEBUG_ALL;
     }