BUG/MEDIUM: mworker: cleanup the listeners when reexecuting

Previously, the cleanup of the listeners was done in mworker_loop(),
which was called once the configuration file was parsed. HAProxy was
switching in wait mode when the configuration failed to load, so no
listeners where created.

Since the latest change on the mworker mode, HAProxy switch to wait mode
after successfuly loading the configuration, without cleaning its
listeners, because it was done in mworker_loop, resulting in the master
not closing its listeners and keeping them. The master needs its
configuration to know which listeners it need to close, so that must be
done before the exec().

This patch fixes the problem by cleaning the listeners in the
mworker_reexec() function.

No backport needeed.

diff --git a/src/haproxy.c b/src/haproxy.c
index 187ba750ae9ba1c621b7564f10e42938fd4751bb..3c04c58e6eece035ef42c5320b196cb9351e2dc1 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -709,6 +709,9 @@ static void mworker_reexec()
 
        mworker_proc_list_to_env(); /* put the children description in the env */
 
+       /* ensure that we close correctly every listeners before reexecuting */
+       mworker_cleanlisteners();
+
        /* during the reload we must ensure that every FDs that can't be
         * reuse (ie those that are not referenced in the proc_list)
         * are closed or they will leak. */
@@ -838,7 +841,6 @@ static void mworker_loop()
        signal_register_fct(SIGCHLD, mworker_catch_sigchld, SIGCHLD);
 
        mworker_unblock_signals();
-       mworker_cleanlisteners();
        mworker_cleantasks();
 
        mworker_catch_sigchld(NULL); /* ensure we clean the children in case