mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-25 07:41:36 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: stats: use the admin flags for soft enable/disable/stop/start on the web page

Browse Source 
Instead of changing the weight to zero or enforcing maintenance mode, we
now make use of the new MAINT/DRAIN flags which are correctly propagated.
This commit is contained in:
Willy Tarreau 2014-05-22 17:22:34 +02:00
parent bfc7b7acd8
commit fae3a7eacd
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dumpstats.c
View File

@ -4241,30 +4241,32 @@ static int stats_process_http_post(struct stream_interface *si)
else if ((sv = findserver(px, value)) != NULL) { else if ((sv = findserver(px, value)) != NULL) {
switch (action) { switch (action) {
case ST_ADM_ACTION_DISABLE: case ST_ADM_ACTION_DISABLE:
if ((px->state != PR_STSTOPPED) && !(sv->admin & SRV_ADMF_FMAINT)) { if (!(sv->admin & SRV_ADMF_FMAINT)) {
altered_servers++; altered_servers++;
total_servers++; total_servers++;
srv_adm_set_maint(sv); srv_set_admin_flag(sv, SRV_ADMF_FMAINT);
} }
break; break;
case ST_ADM_ACTION_ENABLE: case ST_ADM_ACTION_ENABLE:
if ((px->state != PR_STSTOPPED) && (sv->admin & SRV_ADMF_FMAINT)) { if (sv->admin & SRV_ADMF_FMAINT) {
altered_servers++; altered_servers++;
total_servers++; total_servers++;
srv_adm_set_ready(sv); srv_clr_admin_flag(sv, SRV_ADMF_FMAINT);
} }
break; break;
case ST_ADM_ACTION_STOP: case ST_ADM_ACTION_STOP:
case ST_ADM_ACTION_START: if (!(sv->admin & SRV_ADMF_FDRAIN)) {
if (action == ST_ADM_ACTION_START) srv_set_admin_flag(sv, SRV_ADMF_FDRAIN);
sv->uweight = sv->iweight;
else
sv->uweight = 0;
server_recalc_eweight(sv);
altered_servers++; altered_servers++;
total_servers++; total_servers++;
}
break;
case ST_ADM_ACTION_START:
if (sv->admin & SRV_ADMF_FDRAIN) {
srv_clr_admin_flag(sv, SRV_ADMF_FDRAIN);
altered_servers++;
total_servers++;
}
break; break;
case ST_ADM_ACTION_SHUTDOWN: case ST_ADM_ACTION_SHUTDOWN:
if (px->state != PR_STSTOPPED) { if (px->state != PR_STSTOPPED) {