[BUG] critical errors should be reported even in daemon mode

Josh Goebel reported that haproxy silently dies when it fails to
chroot. In fact, it does so when in daemon mode, because daemon
mode has been disabling output for ages.

Since the code has been reworked, this could have been changed
because there is no reason for this anymore, hence this patch.
(cherry picked from commit 304d6fb00fe32fca1bd932a301d4afb7d54c92bc)

diff --git a/src/haproxy.c b/src/haproxy.c
index d80620487869797cb96bb09bf1e17cc906f41d54..9b4c2a961cdf171287c5200b2af36275fd42083d 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -895,11 +895,6 @@ int main(int argc, char **argv)
        signal(SIGTTOU, sig_pause);
        signal(SIGTTIN, sig_listen);
 
-       if (global.mode & MODE_DAEMON) {
-               global.mode &= ~MODE_VERBOSE;
-               global.mode |= MODE_QUIET;
-       }
-
        /* MODE_QUIET can inhibit alerts and warnings below this line */
 
        global.mode &= ~MODE_STARTING;
@@ -1061,10 +1056,11 @@ int main(int argc, char **argv)
                 * it would have already be done, and 0-2 would have been affected to listening
                 * sockets
                 */
-               if (!(global.mode & MODE_QUIET)) {
+               if (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)) {
                        /* detach from the tty */
                        fclose(stdin); fclose(stdout); fclose(stderr);
                        close(0); close(1); close(2); /* close all fd's */
+                       global.mode &= ~MODE_VERBOSE;
                        global.mode |= MODE_QUIET; /* ensure that we won't say anything from now */
                }
                pid = getpid(); /* update child's pid */