diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-01-26 14:31:49 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-01-26 14:31:49 +0000 |
| commit | 9aa30bc51ef9df4b31e6f9977c0be8fb826b0b0f (patch) | |
| tree | 68b736a93c9c5851fd65e7f9b8105e74da14214d /src | |
| parent | 71f729c78cb23c58adb62cb139f22a11b0c80ca0 (diff) | |
| download | nginx-9aa30bc51ef9df4b31e6f9977c0be8fb826b0b0f.tar.gz nginx-9aa30bc51ef9df4b31e6f9977c0be8fb826b0b0f.zip | |
revert the previous commit and r2447 change in src/core/ngx_cycle.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_cycle.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 55d7c2d48..aa0d9ce7e 100644 --- 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 */ |