Mercurial > hg > nginx

changeset 5239:85e72ea8fbfd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Core: fixed stderr redirection on win32 in ngx_reopen_files(). On win32 stderr was not redirected into a file specified by "error_log" while reopening files. Fix is to use platform-independent functions to work with stderr, as already used by ngx_init_cycle() and main() since rev. d8316f307b6a.
author Vladimir Homutov <vl@nginx.com>
date Mon, 03 Jun 2013 16:54:28 +0400
parents a15e2ef8d73d
children d8af1005e886
files src/core/ngx_cycle.c
diffstat 1 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_cycle.c
+++ b/src/core/ngx_cycle.c
@@ -1228,16 +1228,13 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx
         file[i].fd = fd;
     }
 
-#if !(NGX_WIN32)
+    if (cycle->log->file->fd != ngx_stderr) {
 
-    if (cycle->log->file->fd != STDERR_FILENO) {
-        if (dup2(cycle->log->file->fd, STDERR_FILENO) == -1) {
-            ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
-                          "dup2(STDERR) failed");
+        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");
         }
     }
-
-#endif
 }