From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 1 Feb 2010 14:44:43 +0000 (+0000)
Subject: merge r3200:
X-Git-Tag: release-0.7.65~12
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=30ee8008be32ec1b7229eff2bd0b2462146c480c;p=nginx.git

merge r3200:

nginx did not close log file set by --error-log-path,
the bug was introduced in r2744
---

diff --git a/src/core/nginx.c b/src/core/nginx.c
index a9951d3a2..5df96a438 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -380,6 +380,13 @@ main(int argc, char *const *argv)
         }
     }
 
+    if (log->file->fd != ngx_stderr) {
+        if (ngx_close_file(log->file->fd) == NGX_FILE_ERROR) {
+            ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+                          ngx_close_file_n " built-in log failed");
+        }
+    }
+
     ngx_use_stderr = 0;
 
     if (ngx_process == NGX_PROCESS_SINGLE) {