Changeset 1982

Timestamp:

09/05/2007 10:39:56 AM (14 months ago)

Author:

jan

Message:

* fixed forwarding a SIGINT and SIGHUP when using max-workers (#902)

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/server.c (modified) (5 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -6 +6 @@
 - 1.4.18 -
   * fixed compile error on IRIX 6.5.x on prctl() (#1333)
+  * fixed forwarding a SIGINT and SIGHUP when using max-workers (#902)
 
 

branches/lighttpd-1.4.x/src/server.c

@@ -69 +69 @@
 static volatile sig_atomic_t handle_sig_alarm = 1;
 static volatile sig_atomic_t handle_sig_hup = 0;
+static volatile sig_atomic_t forwarded_sig_hup = 0;
 
 #if defined(HAVE_SIGACTION) && defined(SA_SIGINFO)
@@ -95 +96 @@
                 break;
         case SIGHUP:
-                handle_sig_hup = 1;
-                memcpy(&last_sighup_info, si, sizeof(*si));
+                /** 
+                 * we send the SIGHUP to all procs in the process-group
+                 * this includes ourself
+                 * 
+                 * make sure we only send it once and don't create a 
+                 * infinite loop
+                 */
+                if (!forwarded_sig_hup) {
+                        handle_sig_hup = 1;
+                        memcpy(&last_sighup_info, si, sizeof(*si));
+                } else {
+                        forwarded_sig_hup = 0;
+                }
                 break;
         case SIGCHLD:
@@ -989 +1001 @@
         if (num_childs > 0) {
                 int child = 0;
-                while (!child && !srv_shutdown) {
+                while (!child && !srv_shutdown && !graceful_shutdown) {
                         if (num_childs > 0) {
                                 switch (fork()) {
@@ -1004 +1016 @@
                                 int status;
 
-                                /* ignore EINTR */
-                                if (-1 != wait(&status)) num_childs++;
-                        }
-                }
-                if (srv_shutdown) {
-                        kill(0, SIGTERM);
-                }
-                if (!child) return 0;
+                                if (-1 != wait(&status)) {
+                                        /** 
+                                         * one of our workers went away 
+                                         */
+                                        num_childs++;
+                                } else {
+                                        switch (errno) {
+                                        case EINTR:
+                                                /**
+                                                 * if we receive a SIGHUP we have to close our logs ourself as we don't 
+                                                 * have the mainloop who can help us here
+                                                 */
+                                                if (handle_sig_hup) {
+                                                        handle_sig_hup = 0;
+
+                                                        log_error_cycle(srv);
+
+                                                        /**
+                                                         * forward to all procs in the process-group
+                                                         * 
+                                                         * we also send it ourself
+                                                         */
+                                                        if (!forwarded_sig_hup) {
+                                                                forwarded_sig_hup = 1;
+                                                                kill(0, SIGHUP);
+                                                        }
+                                                }
+                                                break;
+                                        default:
+                                                break;
+                                        }
+                                }
+                        }
+                }
+
+                /**
+                 * for the parent this is the exit-point 
+                 */
+                if (!child) {
+                        /** 
+                         * kill all children too 
+                         */
+                        if (graceful_shutdown) {
+                                kill(0, SIGINT);
+                        } else if (srv_shutdown) {
+                                kill(0, SIGTERM);
+                        }
+
+                        log_error_close(srv);
+                        network_close(srv);
+                        connections_free(srv);
+                        plugins_free(srv);
+                        server_free(srv);
+                        return 0;
+                }
         }
 #endif
@@ -1102 +1161 @@
                                 log_error_write(srv, __FILE__, __LINE__, "sdsd", 
                                         "logfiles cycled UID =",
-                                        last_sigterm_info.si_uid,
+                                        last_sighup_info.si_uid,
                                         "PID =",
-                                        last_sigterm_info.si_pid);
+                                        last_sighup_info.si_pid);
 #else
                                 log_error_write(srv, __FILE__, __LINE__, "s",