Mercurial > hg > nginx

comparison src/core/nginx.c @ 5260:e088695737c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
5259:0c699e1d1071 5260:e088695737c3
385 385
386 if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) { 386 if (ngx_create_pidfile(&ccf->pid, cycle->log) != NGX_OK) {
387 return 1; 387 return 1;
388 } 388 }
389 389
390 if (!cycle->log_use_stderr && cycle->log->file->fd != ngx_stderr) { 390 if (ngx_log_redirect_stderr(cycle) != NGX_OK) {
391 391 return 1;
392 if (ngx_set_stderr(cycle->log->file->fd) == NGX_FILE_ERROR) {
393 ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
394 ngx_set_stderr_n " failed");
395 return 1;
396 }
397 } 392 }
398 393
399 if (log->file->fd != ngx_stderr) { 394 if (log->file->fd != ngx_stderr) {
400 if (ngx_close_file(log->file->fd) == NGX_FILE_ERROR) { 395 if (ngx_close_file(log->file->fd) == NGX_FILE_ERROR) {
401 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, 396 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,