[BUG] hot reconfiguration failed because of a wrong error check

The error check in return of start_proxies checked for exact ERR_RETRYABLE
but did not consider the return as a bit field. The function returned both
ERR_RETRYABLE and ERR_ALERT, hence the problem.

diff --git a/src/haproxy.c b/src/haproxy.c
index 1108ea994c770a906e5321f9bcb6d4a1f0582c88..474878688b4e99f051e4df2b8af72388ee44da27 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -817,7 +817,8 @@ int main(int argc, char **argv)
        while (retry >= 0) {
                struct timeval w;
                err = start_proxies(retry == 0 || nb_oldpids == 0);
-               if (err != ERR_RETRYABLE)
+               /* exit the loop on no error or fatal error */
+               if ((err & (ERR_RETRYABLE|ERR_FATAL)) != ERR_RETRYABLE)
                        break;
                if (nb_oldpids == 0)
                        break;