upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-23 23:28:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

MINOR: listeners: do not uselessly try to close zombie listeners in soft_stop()

Browse source 
The loop doesn't match anymore since the non-started listeners are in
LI_INIT and even if it had ever worked the benefit of closing zombies
at this point looks void at best.
This commit is contained in:
Willy Tarreau 2020-09-23 18:12:11 +02:00
parent c6dac6c7f5
commit 987dbf5bab
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/proxy.c
View file

@ -1237,21 +1237,6 @@ void soft_stop(void)
p = proxies_list;
tv_update_date(0,1); /* else, the old time before select will be used */
while (p) {
/* Zombie proxy, let's close the file descriptors */
if (p->state == PR_STSTOPPED &&
!LIST_ISEMPTY(&p->conf.listeners) &&
LIST_ELEM(p->conf.listeners.n,
struct listener *, by_fe)->state > LI_ASSIGNED) {
struct listener *l;
list_for_each_entry(l, &p->conf.listeners, by_fe) {
if (l->state > LI_ASSIGNED) {
fd_delete(l->rx.fd);
l->rx.fd = -1;
}
l->state = LI_INIT;
}
}
if (p->state != PR_STSTOPPED) {
ha_warning("Stopping %s %s in %d ms.\n", proxy_cap_str(p->cap), p->id, p->grace);
send_log(p, LOG_WARNING, "Stopping %s %s in %d ms.\n", proxy_cap_str(p->cap), p->id, p->grace);