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

[MINOR] cleaned up the check_addr patch a bit

Browse Source 
removed useless set_check_addr entry and rely on check_addr itself.
This commit is contained in:
Willy Tarreau 2007-03-25 20:46:19 +02:00
parent cec2e7ad1c
commit 0f03c6f60b
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/server.h
View File

@ -68,8 +68,7 @@ struct server {
#ifdef CONFIG_HAP_CTTPROXY #ifdef CONFIG_HAP_CTTPROXY
struct sockaddr_in tproxy_addr; /* non-local address we want to bind to for connect() */ struct sockaddr_in tproxy_addr; /* non-local address we want to bind to for connect() */
#endif #endif
struct sockaddr_in check_addr; struct sockaddr_in check_addr; /* the address to check, if different from <addr> */
int set_check_addr ;
short check_port; /* the port to use for the health checks */ short check_port; /* the port to use for the health checks */
int health; /* 0->rise-1 = bad; rise->rise+fall-1 = good */ int health; /* 0->rise-1 = bad; rise->rise+fall-1 = good */
int rise, fall; /* time in iterations */ int rise, fall; /* time in iterations */

8
src/cfgparse.c
View File

@ -1197,7 +1197,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args)
newsrv->rise = DEF_RISETIME; newsrv->rise = DEF_RISETIME;
newsrv->fall = DEF_FALLTIME; newsrv->fall = DEF_FALLTIME;
newsrv->health = newsrv->rise; /* up, but will fall down at first failure */ newsrv->health = newsrv->rise; /* up, but will fall down at first failure */
newsrv->set_check_addr = 0;
cur_arg = 3; cur_arg = 3;
while (*args[cur_arg]) { while (*args[cur_arg]) {
if (!strcmp(args[cur_arg], "cookie")) { if (!strcmp(args[cur_arg], "cookie")) {
@ -1220,7 +1220,6 @@ int cfg_parse_listen(const char *file, int linenum, char **args)
} }
else if (!strcmp(args[cur_arg], "addr")) { else if (!strcmp(args[cur_arg], "addr")) {
newsrv->check_addr = *str2sa(args[cur_arg + 1]); newsrv->check_addr = *str2sa(args[cur_arg + 1]);
newsrv->set_check_addr = 1;
cur_arg += 2; cur_arg += 2;
} }
else if (!strcmp(args[cur_arg], "port")) { else if (!strcmp(args[cur_arg], "port")) {
@ -1306,13 +1305,16 @@ int cfg_parse_listen(const char *file, int linenum, char **args)
} }
#endif #endif
else { else {
Alert("parsing [%s:%d] : server %s only supports options 'backup', 'cookie', 'check', 'inter', 'rise', 'fall', 'port', 'source', 'minconn', 'maxconn' and 'weight'.\n", Alert("parsing [%s:%d] : server %s only supports options 'backup', 'cookie', 'check', 'inter', 'rise', 'fall', 'addr', 'port', 'source', 'minconn', 'maxconn' and 'weight'.\n",
file, linenum, newsrv->id); file, linenum, newsrv->id);
return -1; return -1;
} }
} }
if (do_check) { if (do_check) {
if (!newsrv->check_port && newsrv->check_addr.sin_port)
newsrv->check_port = newsrv->check_addr.sin_port;
if (!newsrv->check_port && !(newsrv->state & SRV_MAPPORTS)) if (!newsrv->check_port && !(newsrv->state & SRV_MAPPORTS))
newsrv->check_port = realport; /* by default */ newsrv->check_port = realport; /* by default */
if (!newsrv->check_port) { if (!newsrv->check_port) {

7
src/checks.c
View File

@ -249,16 +249,13 @@ int process_chk(struct task *t)
//fprintf(stderr, "process_chk: 3\n"); //fprintf(stderr, "process_chk: 3\n");
if ( s->set_check_addr == 1 ) if (s->check_addr.sin_addr.s_addr)
{
/* we'll connect to the check addr specified on the server */ /* we'll connect to the check addr specified on the server */
sa = s->check_addr; sa = s->check_addr;
}
else else
{
/* we'll connect to the addr on the server */ /* we'll connect to the addr on the server */
sa = s->addr; sa = s->addr;
}
/* we'll connect to the check port on the server */ /* we'll connect to the check port on the server */
sa.sin_port = htons(s->check_port); sa.sin_port = htons(s->check_port);