commit bf8ff3d4cc327cdec1c07fbac42373b03b42fbfc
author willy tarreau <willy@wtap.(none)> Sat Mar 25 19:47:03 2006 +0100
committer willy tarreau <willy@wtap.(none)> Sat Mar 25 20:33:48 2006 +0100
tree 81721ffd2773ee5d71ddde38839542800215c45e
parent 53e99701c643c18a76c5ae0d9ee80af974e9c7fc

* added the '-db' command-line option to disable backgrounding.

haproxy.c

diff --git a/haproxy.c b/haproxy.c
index 7083b1c..daf6bbe 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -428,6 +428,7 @@
 #define	MODE_CHECK	32
 #define	MODE_VERBOSE	64
 #define	MODE_STARTING	128
+#define	MODE_FOREGROUND	256
 
 /* server flags */
 #define SRV_RUNNING	1	/* the server is UP */
@@ -884,7 +885,7 @@
 	    "D ] [ -n <maxconn> ] [ -N <maxpconn> ]\n"
 	    "        [ -p <pidfile> ] [ -m <max megs> ]\n"
 	    "        -v displays version\n"
-	    "        -d enters debug mode\n"
+	    "        -d enters debug mode ; -db only disables background mode.\n"
 	    "        -V enters verbose mode (disables quiet mode)\n"
 #if STATTIME > 0
 	    "        -s enables statistics output\n"
@@ -8036,6 +8037,8 @@
 #endif
 	    else if (*flag == 'V')
 		arg_mode |= MODE_VERBOSE;
+	    else if (*flag == 'd' && flag[1] == 'b')
+		arg_mode |= MODE_FOREGROUND;
 	    else if (*flag == 'd')
 		arg_mode |= MODE_DEBUG;
 	    else if (*flag == 'c')
@@ -8091,7 +8094,8 @@
     }
 
     global.mode = MODE_STARTING | /* during startup, we want most of the alerts */
-		  (arg_mode & (MODE_DAEMON | MODE_VERBOSE | MODE_QUIET | MODE_CHECK | MODE_DEBUG));
+		  (arg_mode & (MODE_DAEMON | MODE_FOREGROUND | MODE_VERBOSE
+			       | MODE_QUIET | MODE_CHECK | MODE_DEBUG));
 
     if (!cfg_cfgfile)
 	usage(old_argv);
@@ -8126,12 +8130,12 @@
 
     global.maxsock += global.maxconn * 2; /* each connection needs two sockets */
 
-    if (arg_mode & MODE_DEBUG) {
+    if (arg_mode & (MODE_DEBUG | MODE_FOREGROUND)) {
 	/* command line debug mode inhibits configuration mode */
 	global.mode &= ~(MODE_DAEMON | MODE_QUIET);
     }
-    global.mode |= (arg_mode & (MODE_DAEMON | MODE_QUIET | MODE_VERBOSE
-                                | MODE_DEBUG | MODE_STATS | MODE_LOG));
+    global.mode |= (arg_mode & (MODE_DAEMON | MODE_FOREGROUND | MODE_QUIET |
+				MODE_VERBOSE | MODE_DEBUG | MODE_STATS | MODE_LOG));
 
     if ((global.mode & MODE_DEBUG) && (global.mode & (MODE_DAEMON | MODE_QUIET))) {
 	Warning("<debug> mode incompatible with <quiet> and <daemon>. Keeping <debug> only.\n");
@@ -8139,7 +8143,8 @@
     }
 
     if ((global.nbproc > 1) && !(global.mode & MODE_DAEMON)) {
-	Warning("<nbproc> is only meaningful in daemon mode. Setting limit to 1 process.\n");
+	if (!(global.mode & (MODE_FOREGROUND | MODE_DEBUG)))
+	    Warning("<nbproc> is only meaningful in daemon mode. Setting limit to 1 process.\n");
 	global.nbproc = 1;
     }