diff options
| author | Vladimir Homutov <vl@nginx.com> | 2013-06-28 17:24:54 +0400 |
|---|---|---|
| committer | Vladimir Homutov <vl@nginx.com> | 2013-06-28 17:24:54 +0400 |
| commit | dd3e13eef01e9f04ac447eaa3a1a76575944fc28 (patch) | |
| tree | b8652fc39f002250d6032d486e2cde27cf40a0da /src/core/nginx.c | |
| parent | f41c91511d5435b81f795954d3eb00d38f6acf56 (diff) | |
| download | nginx-dd3e13eef01e9f04ac447eaa3a1a76575944fc28.tar.gz nginx-dd3e13eef01e9f04ac447eaa3a1a76575944fc28.zip | |
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().
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 9 |
1 files changed, 2 insertions, 7 deletions
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) { |