Mercurial > hg > nginx
diff src/core/ngx_log.c @ 106:9f9de4deda7e
nginx-0.0.1-2003-06-26-19:35:36 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 26 Jun 2003 15:35:36 +0000 |
parents | 00bee6e7b485 |
children | a9bc21d63fe4 |
line wrap: on
line diff
--- a/src/core/ngx_log.c Sun Jun 15 18:32:13 2003 +0000 +++ b/src/core/ngx_log.c Thu Jun 26 15:35:36 2003 +0000 @@ -41,7 +41,8 @@ }; -static ngx_log_t ngx_log; +static ngx_open_file_t ngx_stderr; +static ngx_log_t ngx_log; static const char *err_levels[] = { @@ -121,12 +122,12 @@ #if (WIN32) errstr[len++] = '\r'; errstr[len++] = '\n'; - if (log->fd) { - WriteFile(log->fd, errstr, len, &written, NULL); + if (log->file->fd) { + WriteFile(log->file->fd, errstr, len, &written, NULL); } #else errstr[len++] = '\n'; - write(log->fd, errstr, len); + write(log->file->fd, errstr, len); #endif @@ -220,23 +221,24 @@ { #if (WIN32) - ngx_log.fd = GetStdHandle(STD_ERROR_HANDLE); + ngx_stderr.fd = GetStdHandle(STD_ERROR_HANDLE); - if (ngx_log.fd == NGX_INVALID_FILE) { + if (ngx_stderr.fd == NGX_INVALID_FILE) { /* TODO: where we can log error ? */ return NULL; - } else if (ngx_log.fd == NULL) { + } else if (ngx_stderr.fd == NULL) { /* there are no associated standard handles */ /* TODO: where we can log possible errors ? */ } #else - ngx_log.fd = STDERR_FILENO; + ngx_stderr.fd = STDERR_FILENO; #endif + ngx_log.file = &ngx_stderr; ngx_log.log_level = NGX_LOG_INFO; /* STUB */ ngx_log.log_level = NGX_LOG_DEBUG; @@ -252,11 +254,11 @@ value = cf->args->elts; - log->fd = ngx_open_file(value[1].data, + log->file->fd = ngx_open_file(value[1].data, NGX_FILE_RDWR, NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND); - if (log->fd == NGX_INVALID_FILE) { + if (log->file->fd == NGX_INVALID_FILE) { err = ngx_errno; len = ngx_snprintf(ngx_conf_errstr, sizeof(ngx_conf_errstr) - 1, ngx_open_file_n " \"%s\" failed (%d: ", @@ -269,7 +271,7 @@ } #if (WIN32) - if (ngx_file_append_mode(log->fd) == NGX_ERROR) { + if (ngx_file_append_mode(log->file->fd) == NGX_ERROR) { err = ngx_errno; len = ngx_snprintf(ngx_conf_errstr, sizeof(ngx_conf_errstr) - 1, ngx_file_append_mode_n " \"%s\" failed (%d: ",