mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-09-21 22:01:31 +02:00
MINOR: check: report error on incompatible proto
If the check mux has been explicitly defined but is incompatible with the selected check type (tcp-check vs http-check), report a warning and prevent haproxy startup.
This commit is contained in:
parent
0519bd4d04
commit
7c14890183
@ -1260,6 +1260,15 @@ static int init_srv_check(struct server *srv)
|
|||||||
(srv->mux_proto->mode == PROTO_MODE_TCP && check_type != TCPCHK_RULES_HTTP_CHK))) {
|
(srv->mux_proto->mode == PROTO_MODE_TCP && check_type != TCPCHK_RULES_HTTP_CHK))) {
|
||||||
srv->check.mux_proto = srv->mux_proto;
|
srv->check.mux_proto = srv->mux_proto;
|
||||||
}
|
}
|
||||||
|
/* test that check proto is valid if explicitly defined */
|
||||||
|
else if (srv->check.mux_proto &&
|
||||||
|
((srv->check.mux_proto->mode == PROTO_MODE_HTTP && check_type != TCPCHK_RULES_HTTP_CHK) ||
|
||||||
|
(srv->check.mux_proto->mode == PROTO_MODE_TCP && check_type == TCPCHK_RULES_HTTP_CHK))) {
|
||||||
|
ha_alert("config: %s '%s': server '%s' uses an incompatible MUX protocol for the selected check type\n",
|
||||||
|
proxy_type_str(srv->proxy), srv->proxy->id, srv->id);
|
||||||
|
ret |= ERR_ALERT | ERR_FATAL;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
/* validate <srv> server health-check settings */
|
/* validate <srv> server health-check settings */
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user