Mercurial > hg > nginx
changeset 5240:d8af1005e886
Core: fixed handling of "stderr" in error_log.
If "stderr" was specified in one of the "error_log" directives,
stderr is not redirected to the first error_log on startup,
configuration reload, and reopening log files.
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Tue, 04 Jun 2013 11:27:36 +0400 |
parents | 85e72ea8fbfd |
children | 03eb70798821 |
files | src/core/nginx.c src/core/ngx_cycle.c src/core/ngx_cycle.h src/core/ngx_log.c src/http/ngx_http_core_module.c |
diffstat | 5 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/nginx.c Mon Jun 03 16:54:28 2013 +0400 +++ b/src/core/nginx.c Tue Jun 04 11:27:36 2013 +0400 @@ -387,7 +387,7 @@ return 1; } - if (cycle->log->file->fd != ngx_stderr) { + 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,
--- a/src/core/ngx_cycle.c Mon Jun 03 16:54:28 2013 +0400 +++ b/src/core/ngx_cycle.c Tue Jun 04 11:27:36 2013 +0400 @@ -582,8 +582,9 @@ /* commit the new cycle configuration */ - if (!ngx_use_stderr && cycle->log->file->fd != ngx_stderr) { - + if (!ngx_use_stderr && !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_ALERT, cycle->log, ngx_errno, ngx_set_stderr_n " failed"); @@ -1228,7 +1229,7 @@ file[i].fd = fd; } - if (cycle->log->file->fd != ngx_stderr) { + 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_ALERT, cycle->log, ngx_errno,
--- a/src/core/ngx_cycle.h Mon Jun 03 16:54:28 2013 +0400 +++ b/src/core/ngx_cycle.h Tue Jun 04 11:27:36 2013 +0400 @@ -41,6 +41,8 @@ ngx_log_t *log; ngx_log_t new_log; + ngx_uint_t log_use_stderr; /* unsigned log_use_stderr:1; */ + ngx_connection_t **files; ngx_connection_t *free_connections; ngx_uint_t free_connection_n;