commit e89c4581f4706187052671a8a40dda4fe3e3c391
author Igor Sysoev <igor@sysoev.ru> Fri Dec 19 08:15:11 2003 +0000
committer Igor Sysoev <igor@sysoev.ru> Fri Dec 19 08:15:11 2003 +0000
tree 3644c7b95ae7ed7b62d830c62e452b632ac9e89b
parent e3466a4058ec3a6c7915f5239fac9f6bfbb6a29d

nginx-0.0.1-2003-12-19-11:15:11 import

src/core/nginx.c

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 36a8b4b..7deb24f 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -72,7 +72,7 @@
     int               i;
     ngx_fd_t          fd;
     ngx_log_t        *log;
-    ngx_cycle_t      *cycle;
+    ngx_cycle_t      *cycle, init_cycle;
     ngx_open_file_t  *file;
 #if !(WIN32)
     size_t            len;
@@ -88,10 +88,19 @@
     /* TODO */ ngx_max_sockets = -1;
 
     ngx_time_init();
+#if (HAVE_PCRE)
     ngx_regex_init();
+#endif
 
     log = ngx_log_init_errlog();
 
+
+    /* init_cycle->log is required for signal handlers */
+
+    ngx_memzero(&init_cycle, sizeof(ngx_cycle_t));
+    init_cycle.log = log;
+    ngx_cycle = &init_cycle;
+
     if (ngx_os_init(log) == NGX_ERROR) {
         return 1;
     }
@@ -207,7 +216,7 @@
                 }
 
                 if (rotate) {
-                    ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "rotating logs");
+                    ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "reopen logs");
 
                     file = cycle->open_files.elts;
                     for (i = 0; i < cycle->open_files.nelts; i++) {