RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-05 10:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: proxy: Use .disabled field as a bitfield as documented

Browse Source 
.disabled field in the proxy structure is documented to be a bitfield. So
use it as a bitfield. This change was introduced to the 2.5, by commit
8e765b86f ("MINOR: proxy: disabled takes a stopping and a disabled state").

No backport is needed except if the above commit is backported.
This commit is contained in:
Christopher Faulet 2021-09-30 18:11:54 +02:00
parent 2468c2176c
commit 647a61cc4b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfgparse-listen.c
View File

@ -595,7 +595,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
else if (strcmp(args[0], "disabled") == 0) { /* disables this proxy */
if (alertif_too_many_args(0, file, linenum, args, &err_code))
goto out;
curproxy->disabled = PR_DISABLED;
curproxy->disabled |= PR_DISABLED;
}
else if (strcmp(args[0], "enabled") == 0) { /* enables this proxy (used to revert a disabled default) */
if (alertif_too_many_args(0, file, linenum, args, &err_code))

2
src/cfgparse.c
View File

@ -1019,7 +1019,7 @@ int cfg_parse_peers(const char *file, int linenum, char **args, int kwm)
stktables_list = t;
}
else if (strcmp(args[0], "disabled") == 0) { /* disables this peers section */
curpeers->disabled = PR_DISABLED;
curpeers->disabled |= PR_DISABLED;
}
else if (strcmp(args[0], "enabled") == 0) { /* enables this peers section (used to revert a disabled default) */
curpeers->disabled = 0;

2
src/mworker.c
View File

@ -443,7 +443,7 @@ void mworker_cleanlisteners()
}
/* if the proxy shouldn't be in the master, we stop it */
if (!listen_in_master)
curproxy->disabled = PR_DISABLED;
curproxy->disabled |= PR_DISABLED;
}
}

2
src/proxy.c
View File

@ -1823,7 +1823,7 @@ void proxy_cond_disable(struct proxy *p)
if (p->li_ready + p->li_paused > 0)
return;
p->disabled = PR_STOPPED;
p->disabled |= PR_STOPPED;
/* Note: syslog proxies use their own loggers so while it's somewhat OK
* to report them being stopped as a warning, we must not spam their log