From dd3e13eef01e9f04ac447eaa3a1a76575944fc28 Mon Sep 17 00:00:00 2001 From: Vladimir Homutov Date: Fri, 28 Jun 2013 17:24:54 +0400 Subject: 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(). --- src/core/nginx.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/core/nginx.c') diff --git a/src/core/nginx.c b/src/core/nginx.c index 796717ab9..4cc80826e 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -387,13 +387,8 @@ main(int argc, char *const *argv) 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) { -- cgit