MEDIUM: New cli option -Ds for systemd compatibility

This patch adds a new option "-Ds" which is exactly like "-D", but instead of
forking n times to get n jobs running and then exiting, prefers to wait for all the
children it just created. With this done, haproxy becomes more systemd-compliant,
without changing anything for other systems.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>

diff --git a/doc/haproxy-en.txt b/doc/haproxy-en.txt
index 3d2a2be7dcaaffd4f354ec464c963c3747952a63..4c673d3510e6653cc114b282682c86b8230ceb35 100644 (file)
--- a/doc/haproxy-en.txt
+++ b/doc/haproxy-en.txt
@@ -51,6 +51,7 @@ There are only a few command line options :
        = 'maxconn' in 'listen' or 'default' sections
     -d starts in foregreound with debugging mode enabled
     -D starts in daemon mode
+    -Ds starts in systemd daemon mode
     -q disable messages on output
     -V displays messages on output even when -q or 'quiet' are specified.
     -c only checks config file and exits with code 0 if no error was found, or

diff --git a/doc/haproxy-fr.txt b/doc/haproxy-fr.txt
index 87bb972b2c1e669335ac51ed9eb2dc27ff95d3ba..0e367249a5372ff381c32ec084d4362171ef5756 100644 (file)
--- a/doc/haproxy-fr.txt
+++ b/doc/haproxy-fr.txt
@@ -53,6 +53,7 @@ Les options de lancement sont peu nombreuses :
        = 'maxconn' dans les sections 'listen' ou 'default'
     -d active le mode debug
     -D passe en daemon
+    -Ds passe en daemon systemd
     -q désactive l'affichage de messages sur la sortie standard.
     -V affiche les messages sur la sortie standard, même si -q ou 'quiet' sont
        spécifiés.

diff --git a/doc/haproxy.1 b/doc/haproxy.1
index 001de15a2ff9f7f6d552e0c5d20af6cbffe42031..48717adefab4f61e9fbf594d01e7651127623daf 100644 (file)
--- a/doc/haproxy.1
+++ b/doc/haproxy.1
@@ -56,6 +56,10 @@ starting up.
 \fB\-D\fP
 Start in daemon mode.
 
+.TP
+\fB\-Ds\fP
+Start in systemd daemon mode, keeping a process in foreground.
+
 .TP
 \fB\-q\fP
 Disable messages on output.

diff --git a/include/types/global.h b/include/types/global.h
index 133a98dc8a9c11098111c7c36b221c95666aca06..730cc64ac60fab76cfd462c5f831f5eaaa42db6b 100644 (file)
--- a/include/types/global.h
+++ b/include/types/global.h
@@ -42,6 +42,7 @@
 #define        MODE_VERBOSE    0x10
 #define        MODE_STARTING   0x20
 #define        MODE_FOREGROUND 0x40
+#define        MODE_SYSTEMD    0x80
 
 /* list of last checks to perform, depending on config options */
 #define LSTCHK_CAP_BIND        0x00000001      /* check that we can bind to any port */

diff --git a/src/haproxy.c b/src/haproxy.c
index 4503a01c2c9bb0b0bc62661b23084dda44c0ed95..92e25c2ef10aefbb3172d175bf038b7ed0216898 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -42,6 +42,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <sys/resource.h>
+#include <sys/wait.h>
 #include <time.h>
 #include <syslog.h>
 #include <grp.h>
@@ -539,8 +540,11 @@ void init(int argc, char **argv)
                                arg_mode |= MODE_DEBUG;
                        else if (*flag == 'c')
                                arg_mode |= MODE_CHECK;
-                       else if (*flag == 'D')
+                       else if (*flag == 'D') {
                                arg_mode |= MODE_DAEMON;
+                               if (flag[1] == 's')  /* -Ds */
+                                       arg_mode |= MODE_SYSTEMD;
+                       }
                        else if (*flag == 'q')
                                arg_mode |= MODE_QUIET;
                        else if (*flag == 's' && (flag[1] == 'f' || flag[1] == 't')) {
@@ -594,7 +598,7 @@ void init(int argc, char **argv)
        }
 
        global.mode = MODE_STARTING | /* during startup, we want most of the alerts */
-               (arg_mode & (MODE_DAEMON | MODE_FOREGROUND | MODE_VERBOSE
+               (arg_mode & (MODE_DAEMON | MODE_SYSTEMD | MODE_FOREGROUND | MODE_VERBOSE
                             | MODE_QUIET | MODE_CHECK | MODE_DEBUG));
 
        if (LIST_ISEMPTY(&cfg_cfgfiles))
@@ -733,24 +737,24 @@ void init(int argc, char **argv)
 
        if (arg_mode & (MODE_DEBUG | MODE_FOREGROUND)) {
                /* command line debug mode inhibits configuration mode */
-               global.mode &= ~(MODE_DAEMON | MODE_QUIET);
+               global.mode &= ~(MODE_DAEMON | MODE_SYSTEMD | MODE_QUIET);
                global.mode |= (arg_mode & (MODE_DEBUG | MODE_FOREGROUND));
        }
 
-       if (arg_mode & MODE_DAEMON) {
+       if (arg_mode & (MODE_DAEMON | MODE_SYSTEMD)) {
                /* command line daemon mode inhibits foreground and debug modes mode */
                global.mode &= ~(MODE_DEBUG | MODE_FOREGROUND);
-               global.mode |= (arg_mode & MODE_DAEMON);
+               global.mode |= (arg_mode & (MODE_DAEMON | MODE_SYSTEMD));
        }
 
        global.mode |= (arg_mode & (MODE_QUIET | MODE_VERBOSE));
 
-       if ((global.mode & MODE_DEBUG) && (global.mode & (MODE_DAEMON | MODE_QUIET))) {
-               Warning("<debug> mode incompatible with <quiet> and <daemon>. Keeping <debug> only.\n");
-               global.mode &= ~(MODE_DAEMON | MODE_QUIET);
+       if ((global.mode & MODE_DEBUG) && (global.mode & (MODE_DAEMON | MODE_SYSTEMD | MODE_QUIET))) {
+               Warning("<debug> mode incompatible with <quiet>, <daemon> and <systemd>. Keeping <debug> only.\n");
+               global.mode &= ~(MODE_DAEMON | MODE_SYSTEMD | MODE_QUIET);
        }
 
-       if ((global.nbproc > 1) && !(global.mode & MODE_DAEMON)) {
+       if ((global.nbproc > 1) && !(global.mode & (MODE_DAEMON | MODE_SYSTEMD))) {
                if (!(global.mode & (MODE_FOREGROUND | MODE_DEBUG)))
                        Warning("<nbproc> is only meaningful in daemon mode. Setting limit to 1 process.\n");
                global.nbproc = 1;
@@ -1355,7 +1359,7 @@ int main(int argc, char **argv)
        }
 
        /* open log & pid files before the chroot */
-       if (global.mode & MODE_DAEMON && global.pidfile != NULL) {
+       if (global.mode & (MODE_DAEMON | MODE_SYSTEMD) && global.pidfile != NULL) {
                unlink(global.pidfile);
                pidfd = open(global.pidfile, O_CREAT | O_WRONLY | O_TRUNC, 0644);
                if (pidfd < 0) {
@@ -1443,9 +1447,10 @@ int main(int argc, char **argv)
                        argv[0], (int)limit.rlim_cur, global.maxconn, global.maxsock, global.maxsock);
        }
 
-       if (global.mode & MODE_DAEMON) {
+       if (global.mode & (MODE_DAEMON | MODE_SYSTEMD)) {
                struct proxy *px;
                int ret = 0;
+               int *children = calloc(global.nbproc, sizeof(int));
                int proc;
 
                /* the father launches the required number of processes */
@@ -1458,6 +1463,7 @@ int main(int argc, char **argv)
                        }
                        else if (ret == 0) /* child breaks here */
                                break;
+                       children[proc] = ret;
                        if (pidfd >= 0) {
                                char pidstr[100];
                                snprintf(pidstr, sizeof(pidstr), "%d\n", ret);
@@ -1493,8 +1499,13 @@ int main(int argc, char **argv)
                        px = px->next;
                }
 
-               if (proc == global.nbproc)
+               if (proc == global.nbproc) {
+                       if (global.mode & MODE_SYSTEMD) {
+                               for (proc = 0; proc < global.nbproc; proc++)
+                                       while (waitpid(children[proc], NULL, 0) == -1 && errno == EINTR);
+                       }
                        exit(0); /* parent must leave */
+               }
 
                /* if we're NOT in QUIET mode, we should now close the 3 first FDs to ensure
                 * that we can detach from the TTY. We MUST NOT do it in other cases since