upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-29 18:18:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source 
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.
This commit is contained in:
Willy Tarreau 2007-12-20 23:05:50 +01:00
parent 4009f016c2
commit e13e9251a6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/haproxy.c
View file

@ -851,7 +851,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;