mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-17 14:50:59 +01:00
Code Issues Projects Releases Wiki Activity

[BUG] we must not exit if protocol binding only returns a warning

Browse Source 
Right now, protocol binding cannot return a warning, but when this
will happen, we must not exit but just print the warning.
(cherry picked from commit 0a3b9d90d3570cb618c7008cd1d7348d48a3868c)
(cherry picked from commit 035514abcf6139ff7da2b54f89c17117b6ddf57f)
This commit is contained in:
Willy Tarreau 2009-02-04 17:05:23 +01:00
parent 20e102e2af
commit a1b9a08eff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/haproxy.c
View File

@ -870,7 +870,7 @@ int main(int argc, char **argv)
}
/* Note: start_proxies() sends an alert when it fails. */
if (err != ERR_NONE) {
if ((err & ~ERR_WARN) != ERR_NONE) {
if (retry != MAX_START_RETRIES && nb_oldpids)
tell_old_pids(SIGTTIN);
exit(1);
@ -883,7 +883,7 @@ int main(int argc, char **argv)
exit(1);
}
if (protocol_bind_all() != ERR_NONE) {
if ((protocol_bind_all() & ~ERR_WARN) != ERR_NONE) {
Alert("[%s.main()] Some protocols failed to start their listeners! Exiting.\n", argv[0]);
protocol_unbind_all(); /* cleanup everything we can */
if (nb_oldpids)