Mercurial > hg > nginx
diff src/core/ngx_log.c @ 448:241dc8092a33
nginx-0.1.0-2004-10-01-19:53:53 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 01 Oct 2004 15:53:53 +0000 |
parents | f26432a1935a |
children | 3b1e8c9df9ad |
line wrap: on
line diff
--- a/src/core/ngx_log.c Thu Sep 30 19:44:38 2004 +0000 +++ b/src/core/ngx_log.c Fri Oct 01 15:53:53 2004 +0000 @@ -224,11 +224,8 @@ #endif - -ngx_log_t *ngx_log_init_errlog() +ngx_log_t *ngx_log_init_stderr() { - ngx_fd_t fd; - #if (WIN32) ngx_stderr.fd = GetStdHandle(STD_ERROR_HANDLE); @@ -253,18 +250,25 @@ #endif ngx_log.file = &ngx_stderr; + ngx_log.log_level = NGX_LOG_ERR; + + return &ngx_log; +} + + +ngx_int_t ngx_log_init_error_log() +{ + ngx_fd_t fd; #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); if (fd == NGX_INVALID_FILE) { ngx_log_error(NGX_LOG_EMERG, (&ngx_log), ngx_errno, ngx_open_file_n " \"" NGX_ERROR_LOG_PATH "\" failed"); - return NULL; + return NGX_ERROR; } #if (WIN32) @@ -273,7 +277,7 @@ ngx_log_error(NGX_LOG_EMERG, (&ngx_log), ngx_errno, ngx_file_append_mode_n " \"" NGX_ERROR_LOG_PATH "\" failed"); - return NULL; + return NGX_ERROR; } #else @@ -281,18 +285,18 @@ if (dup2(fd, STDERR_FILENO) == NGX_ERROR) { ngx_log_error(NGX_LOG_EMERG, (&ngx_log), ngx_errno, "dup2(STDERR) failed"); - return NULL; + return NGX_ERROR; } #endif -#else +#else /* no NGX_ERROR_LOG_PATH */ ngx_log.log_level = NGX_LOG_INFO; #endif - return &ngx_log; + return NGX_OK; }