240ad98e89
- add missing patches - add patch number to version git-svn-id: svn://svn.openwrt.org/openwrt/packages@35091 3c298f89-4303-0410-b956-a3cf2f4a3e73
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From ce64f84c174fc65ea02f3f1cba2b3295c0b34198 Mon Sep 17 00:00:00 2001
|
|
From: Willy Tarreau <w@1wt.eu>
|
|
Date: Fri, 26 Oct 2012 16:04:28 +0200
|
|
Subject: BUG/MEDIUM: command-line option -D must have precedence over "debug"
|
|
|
|
From the beginning it has been said that -D must always be used on the
|
|
command line from startup scripts so that haproxy does not accidentally
|
|
stay in foreground when loaded from init script... Except that this has
|
|
not been true for a long time now.
|
|
|
|
The fix is easy and must be backported to 1.4 too which is affected.
|
|
(cherry picked from commit 772f0dd545eb3837e2bc794f4c4863663be3742c)
|
|
---
|
|
src/haproxy.c | 11 +++++++++--
|
|
1 files changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/haproxy.c b/src/haproxy.c
|
|
index 2944462..ec481aa 100644
|
|
--- a/src/haproxy.c
|
|
+++ b/src/haproxy.c
|
|
@@ -649,9 +649,16 @@ 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 |= (arg_mode & (MODE_DEBUG | MODE_FOREGROUND));
|
|
}
|
|
- global.mode |= (arg_mode & (MODE_DAEMON | MODE_FOREGROUND | MODE_QUIET |
|
|
- MODE_VERBOSE | MODE_DEBUG ));
|
|
+
|
|
+ if (arg_mode & MODE_DAEMON) {
|
|
+ /* 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_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");
|
|
--
|
|
1.7.1
|
|
|