From: Willy Tarreau <w@1wt.eu>
Date: Mon, 18 May 2009 14:29:51 +0000 (+0200)
Subject: [MINOR] startup: don't imply -q with -D
X-Git-Tag: v1.4-dev1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bde87b7574df1b521633da35b0fa5dacc137d29;p=thirdparty%2Fhaproxy.git

[MINOR] startup: don't imply -q with -D

It is recommended to have -D in init scripts, but -D also implies
quiet mode, which hides warning messages, and both options are now
completely unrelated. Remove the implication to get warnings with
-D.
---

diff --git a/src/haproxy.c b/src/haproxy.c
index 1c4501a1d4..e656859e14 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -203,7 +203,7 @@ void usage(char *name)
 		"        -v displays version ; -vv shows known build options.\n"
 		"        -d enters debug mode ; -db only disables background mode.\n"
 		"        -V enters verbose mode (disables quiet mode)\n"
-		"        -D goes daemon ; implies -q\n"
+		"        -D goes daemon\n"
 		"        -q quiet mode : don't display messages\n"
 		"        -c check mode : only check config file and exit\n"
 		"        -n sets the maximum total # of connections (%d)\n"
@@ -475,7 +475,7 @@ void init(int argc, char **argv)
 			else if (*flag == 'c')
 				arg_mode |= MODE_CHECK;
 			else if (*flag == 'D')
-				arg_mode |= MODE_DAEMON | MODE_QUIET;
+				arg_mode |= MODE_DAEMON;
 			else if (*flag == 'q')
 				arg_mode |= MODE_QUIET;
 			else if (*flag == 's' && (flag[1] == 'f' || flag[1] == 't')) {