From 5d7f9ce83123ece0245994b6c07298c872111cc9 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 24 Sep 2020 18:54:11 +0200 Subject: [PATCH] MINOR: listeners: check the current listener earlier state in resume_listener() It's quite confusing to have the test on LI_READY very low in the function as it should be made much earlier. Just like with previous commit, let's do it when entering. The additional states, however (limited, full) continue to go through the whole function. --- src/listener.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/listener.c b/src/listener.c index 6370a9f30..6327949a1 100644 --- a/src/listener.c +++ b/src/listener.c @@ -395,6 +395,9 @@ int resume_listener(struct listener *l) !(proc_mask(l->rx.settings->bind_proc) & pid_bit)) goto end; + if (l->state == LI_READY) + goto end; + if (l->state == LI_ASSIGNED) { char msg[100]; int err; @@ -423,9 +426,6 @@ int resume_listener(struct listener *l) goto end; } - if (l->state == LI_READY) - goto end; - if (l->maxconn && l->nbconn >= l->maxconn) { listener_set_state(l, LI_FULL); goto end;