Mercurial > hg > nginx
diff src/core/ngx_log.c @ 445:f26432a1935a
nginx-0.1.0-2004-09-30-10:38:49 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 30 Sep 2004 06:38:49 +0000 |
parents | 42d11f017717 |
children | 241dc8092a33 |
line wrap: on
line diff
--- a/src/core/ngx_log.c Wed Sep 29 16:00:49 2004 +0000 +++ b/src/core/ngx_log.c Thu Sep 30 06:38:49 2004 +0000 @@ -253,10 +253,11 @@ #endif ngx_log.file = &ngx_stderr; - ngx_log.log_level = NGX_LOG_ERR; #ifdef NGX_ERROR_LOG_PATH + ngx_log.log_level = NGX_LOG_ERR; + fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR, NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND); @@ -285,6 +286,10 @@ #endif +#else + + ngx_log.log_level = NGX_LOG_INFO; + #endif return &ngx_log; @@ -375,12 +380,19 @@ value = cf->args->elts; - cf->cycle->new_log->file->name = value[1]; + if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) { + cf->cycle->new_log->file->fd = ngx_stderr.fd; + cf->cycle->new_log->file->name.len = 0; + cf->cycle->new_log->file->name.data = NULL; - if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name) + } else { + cf->cycle->new_log->file->name = value[1]; + + if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name) == NGX_ERROR) - { - return NGX_CONF_ERROR; + { + return NGX_CONF_ERROR; + } } return ngx_set_error_log_levels(cf, cf->cycle->new_log);