mirror of
https://github.com/nginx/nginx.git
synced 2025-02-25 18:55:26 -06:00
"down" server caused endless loop
This commit is contained in:
parent
c92483b948
commit
3625a458d9
@ -48,11 +48,11 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf,
|
|||||||
peers->peer[n].sockaddr = server[i].addrs[j].sockaddr;
|
peers->peer[n].sockaddr = server[i].addrs[j].sockaddr;
|
||||||
peers->peer[n].socklen = server[i].addrs[j].socklen;
|
peers->peer[n].socklen = server[i].addrs[j].socklen;
|
||||||
peers->peer[n].name = server[i].addrs[j].name;
|
peers->peer[n].name = server[i].addrs[j].name;
|
||||||
peers->peer[n].weight = server[i].weight;
|
|
||||||
peers->peer[n].current_weight = server[i].weight;
|
|
||||||
peers->peer[n].max_fails = server[i].max_fails;
|
peers->peer[n].max_fails = server[i].max_fails;
|
||||||
peers->peer[n].fail_timeout = server[i].fail_timeout;
|
peers->peer[n].fail_timeout = server[i].fail_timeout;
|
||||||
peers->peer[n].down = server[i].down;
|
peers->peer[n].down = server[i].down;
|
||||||
|
peers->peer[n].weight = server[i].down ? 0 : server[i].weight;
|
||||||
|
peers->peer[n].current_weight = peers->peer[n].weight;
|
||||||
n++;
|
n++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user