upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-22 23:02:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

MINOR: startup: Extend the scope the MODE_STARTING flag

Browse source 
Now, MODE_STARTING is set at the begining to init function and it is removed
just before the polling loop. So more alerts or warnings are saved.
This commit is contained in:
Christopher Faulet 2017-10-24 13:53:54 +02:00 committed by Willy Tarreau
parent c1b730a41a
commit e3a5e35708
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/haproxy.c
View file

@ -1127,6 +1127,7 @@ static void init(int argc, char **argv)
struct proxy *px;
struct post_check_fct *pcf;
global.mode = MODE_STARTING;
next_argv = copy_argv(argc, argv);
if (!init_trash_buffers()) {
@ -1340,9 +1341,8 @@ static void init(int argc, char **argv)
argv++; argc--;
}
global.mode = MODE_STARTING | /* during startup, we want most of the alerts */
(arg_mode & (MODE_DAEMON | MODE_MWORKER | MODE_FOREGROUND | MODE_VERBOSE
| MODE_QUIET | MODE_CHECK | MODE_DEBUG));
global.mode |= (arg_mode & (MODE_DAEMON | MODE_MWORKER | MODE_FOREGROUND | MODE_VERBOSE
| MODE_QUIET | MODE_CHECK | MODE_DEBUG));
/* Master workers wait mode */
if ((global.mode & MODE_MWORKER) && (getenv("HAPROXY_MWORKER_WAIT_ONLY") != NULL)) {
@ -2390,7 +2390,6 @@ int main(int argc, char **argv)
/* MODE_QUIET can inhibit alerts and warnings below this line */
global.mode &= ~MODE_STARTING;
if ((global.mode & MODE_QUIET) && !(global.mode & MODE_VERBOSE)) {
/* detach from the tty */
fclose(stdin); fclose(stdout); fclose(stderr);
@ -2695,6 +2694,8 @@ int main(int argc, char **argv)
fork_poller();
}
global.mode &= ~MODE_STARTING;
if (global.mode & MODE_MWORKER)
mworker_pipe_register(mworker_pipe);