mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: server: remove unused variables in srv_update_status()

Browse Source 
check and px local variable aliases are not very useful.
Let's remove them and use s->check and s->proxy instead.
This commit is contained in:
Aurelien DARRAGON 2023-04-18 12:08:18 +02:00 committed by Christopher Faulet
parent 1746b56e68
commit c54b98ac9a
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/server.c
View File

@ -5276,9 +5276,7 @@ static void srv_lb_propagate(struct server *s)
*/ */
static void srv_update_status(struct server *s) static void srv_update_status(struct server *s)
{ {
struct check *check = &s->check;
int xferred; int xferred;
struct proxy *px = s->proxy;
int prev_srv_count = s->proxy->srv_bck + s->proxy->srv_act; int prev_srv_count = s->proxy->srv_bck + s->proxy->srv_act;
int srv_was_stopping = (s->cur_state == SRV_ST_STOPPING) || (s->cur_admin & SRV_ADMF_DRAIN); int srv_was_stopping = (s->cur_state == SRV_ST_STOPPING) || (s->cur_admin & SRV_ADMF_DRAIN);
enum srv_state srv_prev_state = s->cur_state; enum srv_state srv_prev_state = s->cur_state;
@ -5418,7 +5416,7 @@ static void srv_update_status(struct server *s)
if (!(s->cur_admin & SRV_ADMF_MAINT) && (s->next_admin & SRV_ADMF_MAINT)) { if (!(s->cur_admin & SRV_ADMF_MAINT) && (s->next_admin & SRV_ADMF_MAINT)) {
if (s->check.state & CHK_ST_ENABLED) { if (s->check.state & CHK_ST_ENABLED) {
s->check.state |= CHK_ST_PAUSED; s->check.state |= CHK_ST_PAUSED;
check->health = 0; s->check.health = 0;
} }
if (s->cur_state == SRV_ST_STOPPED) { /* server was already down */ if (s->cur_state == SRV_ST_STOPPED) { /* server was already down */
@ -5440,7 +5438,7 @@ static void srv_update_status(struct server *s)
} }
} }
else { /* server was still running */ else { /* server was still running */
check->health = 0; /* failure */ s->check.health = 0; /* failure */
s->next_state = SRV_ST_STOPPED; s->next_state = SRV_ST_STOPPED;
srv_lb_propagate(s); srv_lb_propagate(s);
@ -5496,7 +5494,7 @@ static void srv_update_status(struct server *s)
*/ */
if (s->check.state & CHK_ST_ENABLED) { if (s->check.state & CHK_ST_ENABLED) {
s->check.state &= ~CHK_ST_PAUSED; s->check.state &= ~CHK_ST_PAUSED;
check->health = check->rise; /* start OK but check immediately */ s->check.health = s->check.rise; /* start OK but check immediately */
} }
if ((!s->track || s->track->next_state != SRV_ST_STOPPED) && if ((!s->track || s->track->next_state != SRV_ST_STOPPED) &&