comparison src/core/ngx_cycle.c @ 2466:550ab350c306

revert the previous commit and r2447 change in src/core/ngx_cycle.c
author Igor Sysoev <igor@sysoev.ru>
date Mon, 26 Jan 2009 14:31:49 +0000
parents 3882ced159b6
children 2e91aecb9e57
comparison
equal deleted inserted replaced
2465:3882ced159b6 2466:550ab350c306
166 if (cycle->new_log == NULL) { 166 if (cycle->new_log == NULL) {
167 ngx_destroy_pool(pool); 167 ngx_destroy_pool(pool);
168 return NULL; 168 return NULL;
169 } 169 }
170 170
171 cycle->new_log->log_level = NGX_LOG_ERR;
172 cycle->new_log->file->name = error_log; 171 cycle->new_log->file->name = error_log;
173 172
174 173
175 n = old_cycle->listening.nelts ? old_cycle->listening.nelts : 10; 174 n = old_cycle->listening.nelts ? old_cycle->listening.nelts : 10;
176 175
392 #endif 391 #endif
393 } 392 }
394 393
395 cycle->log = cycle->new_log; 394 cycle->log = cycle->new_log;
396 pool->log = cycle->new_log; 395 pool->log = cycle->new_log;
396
397 if (cycle->log->log_level == 0) {
398 cycle->log->log_level = NGX_LOG_ERR;
399 }
397 400
398 401
399 /* create shared memory */ 402 /* create shared memory */
400 403
401 part = &cycle->shared_memory.part; 404 part = &cycle->shared_memory.part;