Mercurial > hg > nginx
diff src/core/nginx.c @ 5260:e088695737c3
Core: consolidated log-related code.
The stderr redirection code is moved to ngx_log_redirect_stderr().
The opening of the default log code is moved to ngx_log_open_default().
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Fri, 28 Jun 2013 17:24:54 +0400 |
parents | d8af1005e886 |
children | f1a91825730a |
line wrap: on
line diff
--- a/src/core/nginx.c Tue Jul 02 20:05:49 2013 +0400 +++ b/src/core/nginx.c Fri Jun 28 17:24:54 2013 +0400 @@ -387,13 +387,8 @@ return 1; } - if (!cycle->log_use_stderr && cycle->log->file->fd != ngx_stderr) { - - if (ngx_set_stderr(cycle->log->file->fd) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, - ngx_set_stderr_n " failed"); - return 1; - } + if (ngx_log_redirect_stderr(cycle) != NGX_OK) { + return 1; } if (log->file->fd != ngx_stderr) {