Ticket #2288: fix-core-on-reloading.patch

src/core/ngx_cycle.c

@@ -640 +640 @@
 
     /* close and delete stuff that lefts from an old cycle */
 
+    /*
+     * log the remaining events of the old cycle with the new log as the old one
+     * may become unusable while cleaning the data
+     */
+
+    log = cycle->log;
+    old_cycle->log = log;
+    old_cycle->pool->log = log;
+    conf.temp_pool->log = log;
+
     /* free the unnecessary shared memory */
 
     opart = &old_cycle->shared_memory.part;
@@ -795 +805 @@
         ngx_memzero(ngx_old_cycles.elts, n * sizeof(ngx_cycle_t *));
 
         ngx_cleaner_event.handler = ngx_clean_old_cycles;
-        ngx_cleaner_event.log = cycle->log;
         ngx_cleaner_event.data = &dumb;
         dumb.fd = (ngx_socket_t) -1;
     }
 
     ngx_temp_pool->log = cycle->log;
+    ngx_cleaner_event.log = cycle->log;
 
     old = ngx_array_push(&ngx_old_cycles);
     if (old == NULL) {
@@ -818 +828 @@
 
 failed:
 
+    /*
+     * log the remaining events with the previous log as the current one
+     * may become unusable while cleaning the data
+     */
+
+    cycle->log = log;
+    pool->log = log;
+    conf.temp_pool->log = log;
+    conf.log = log;
+
     if (!ngx_is_init_cycle(old_cycle)) {
         old_ccf = (ngx_core_conf_t *) ngx_get_conf(old_cycle->conf_ctx,
                                                    ngx_core_module);