Skip to content

[pull] master from haproxy:master #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 4, 2021
Merged

[pull] master from haproxy:master #170

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5138,6 +5138,7 @@ static void srv_update_status(struct server *s)
s->next_state = SRV_ST_STOPPING;
}
else {
s->last_change = now.tv_sec;
s->next_state = SRV_ST_STARTING;
if (s->slowstart > 0) {
if (s->warmup)
Expand Down Expand Up @@ -5197,6 +5198,8 @@ static void srv_update_status(struct server *s)

if (prev_srv_count && s->proxy->srv_bck == 0 && s->proxy->srv_act == 0)
set_backend_down(s->proxy);
else if (!prev_srv_count && (s->proxy->srv_bck || s->proxy->srv_act))
s->proxy->last_change = now.tv_sec;

/* If the server is set with "on-marked-up shutdown-backup-sessions",
* and it's not a backup server and its effective weight is > 0,
Expand Down