Changeset 1662

Timestamp:

02/19/2007 01:33:28 PM (20 months ago)

Author:

jan

Message:

added support for daemontools and the -I option (patch by
dermoth@…)

Location:

trunk/src

Files:

• base.h (modified) (1 diff)
• server.c (modified) (4 diffs)

trunk/src/base.h

@@ -453 +453 @@
 
         unsigned short dont_daemonize;
+        unsigned short daemonize_on_shutdown;
         buffer *changeroot;
         buffer *username;

trunk/src/server.c

@@ -478 +478 @@
 " -t         test the config-file, and exit\n" \
 " -D         don't go to background (default: go to background)\n" \
+" -I         go to background on SIGINT (useful with -D)\n" \
+"            has no effect when using kqueue or /dev/poll\n" \
 " -v         show version\n" \
 " -V         show compile-time features\n" \
@@ -814 +816 @@
                                                 srv_socket->sock->fd = -1;
 
+#ifdef HAVE_FORK
+                                                /* FreeBSD kqueue could possibly work with rfork(RFFDG)
+                                                * while Solaris /dev/poll would require re-registering
+                                                * all fd */
+                                                if (srv->srvconf.daemonize_on_shutdown &&
+                                                        srv->event_handler != FDEVENT_HANDLER_FREEBSD_KQUEUE &&
+                                                        srv->event_handler != FDEVENT_HANDLER_SOLARIS_DEVPOLL) {
+                                                        daemonize();
+                                                }
+#endif
+
                                                 /* network_close() will cleanup after us */
                                         }
@@ -1059 +1072 @@
 #endif
         srv->srvconf.dont_daemonize = 0;
+        srv->srvconf.daemonize_on_shutdown = 0;
         srv->srvconf.max_stat_threads = 4;
         srv->srvconf.max_read_threads = 8;
 
-        while(-1 != (o = getopt(argc, argv, "f:m:hvVDpt"))) {
+        while(-1 != (o = getopt(argc, argv, "f:m:hvVDIpt"))) {
                 switch(o) {
                 case 'f':
@@ -1076 +1090 @@
                 case 't': test_config = 1; break;
                 case 'D': srv->srvconf.dont_daemonize = 1; break;
+                case 'I': srv->srvconf.daemonize_on_shutdown = 1; break;
                 case 'v': show_version(); return 0;
                 case 'V': show_features(); return 0;