mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 06:11:32 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: cfgparse: make backend_parse_balance() use memprintf to report errors

Browse Source 
Using the new error reporting framework makes it easier to report complex
errors.
This commit is contained in:
Willy Tarreau 2012-05-08 18:14:39 +02:00
parent f4068b6503
commit a93c74be5c
3 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/proto/backend.h
View File

@ -35,8 +35,7 @@ int assign_server_and_queue(struct session *s);
int connect_server(struct session *s); int connect_server(struct session *s);
int srv_redispatch_connect(struct session *t); int srv_redispatch_connect(struct session *t);
const char *backend_lb_algo_str(int algo); const char *backend_lb_algo_str(int algo);
int backend_parse_balance(const char **args, char *err, int backend_parse_balance(const char **args, char **err, struct proxy *curproxy);
int errlen, struct proxy *curproxy);
int tcp_persist_rdp_cookie(struct session *s, struct buffer *req, int an_bit); int tcp_persist_rdp_cookie(struct session *s, struct buffer *req, int an_bit);
int be_downtime(struct proxy *px); int be_downtime(struct proxy *px);

30
src/backend.c
View File

@ -1215,12 +1215,12 @@ const char *backend_lb_algo_str(int algo) {
/* This function parses a "balance" statement in a backend section describing /* This function parses a "balance" statement in a backend section describing
* <curproxy>. It returns -1 if there is any error, otherwise zero. If it * <curproxy>. It returns -1 if there is any error, otherwise zero. If it
* returns -1, it may write an error message into ther <err> buffer, for at * returns -1, it will write an error message into the <err> buffer which will
* most <errlen> bytes, trailing zero included. The trailing '\n' will not be * automatically be allocated and must be passed as NULL. The trailing '\n'
* written. The function must be called with <args> pointing to the first word * will not be written. The function must be called with <args> pointing to the
* after "balance". * first word after "balance".
*/ */
int backend_parse_balance(const char **args, char *err, int errlen, struct proxy *curproxy) int backend_parse_balance(const char **args, char **err, struct proxy *curproxy)
{ {
if (!*(args[0])) { if (!*(args[0])) {
/* if no option is set, use round-robin by default */ /* if no option is set, use round-robin by default */
@ -1258,7 +1258,7 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
while (*args[arg]) { while (*args[arg]) {
if (!strcmp(args[arg], "len")) { if (!strcmp(args[arg], "len")) {
if (!*args[arg+1] || (atoi(args[arg+1]) <= 0)) { if (!*args[arg+1] || (atoi(args[arg+1]) <= 0)) {
snprintf(err, errlen, "'balance uri len' expects a positive integer (got '%s').", args[arg+1]); memprintf(err, "%s : '%s' expects a positive integer (got '%s').", args[0], args[arg], args[arg+1]);
return -1; return -1;
} }
curproxy->uri_len_limit = atoi(args[arg+1]); curproxy->uri_len_limit = atoi(args[arg+1]);
@ -1266,7 +1266,7 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
} }
else if (!strcmp(args[arg], "depth")) { else if (!strcmp(args[arg], "depth")) {
if (!*args[arg+1] || (atoi(args[arg+1]) <= 0)) { if (!*args[arg+1] || (atoi(args[arg+1]) <= 0)) {
snprintf(err, errlen, "'balance uri depth' expects a positive integer (got '%s').", args[arg+1]); memprintf(err, "%s : '%s' expects a positive integer (got '%s').", args[0], args[arg], args[arg+1]);
return -1; return -1;
} }
/* hint: we store the position of the ending '/' (depth+1) so /* hint: we store the position of the ending '/' (depth+1) so
@ -1276,14 +1276,14 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
arg += 2; arg += 2;
} }
else { else {
snprintf(err, errlen, "'balance uri' only accepts parameters 'len' and 'depth' (got '%s').", args[arg]); memprintf(err, "%s only accepts parameters 'len' and 'depth' (got '%s').", args[0], args[arg]);
return -1; return -1;
} }
} }
} }
else if (!strcmp(args[0], "url_param")) { else if (!strcmp(args[0], "url_param")) {
if (!*args[1]) { if (!*args[1]) {
snprintf(err, errlen, "'balance url_param' requires an URL parameter name."); memprintf(err, "%s requires an URL parameter name.", args[0]);
return -1; return -1;
} }
curproxy->lbprm.algo &= ~BE_LB_ALGO; curproxy->lbprm.algo &= ~BE_LB_ALGO;
@ -1294,7 +1294,7 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
curproxy->url_param_len = strlen(args[1]); curproxy->url_param_len = strlen(args[1]);
if (*args[2]) { if (*args[2]) {
if (strcmp(args[2], "check_post")) { if (strcmp(args[2], "check_post")) {
snprintf(err, errlen, "'balance url_param' only accepts check_post modifier."); memprintf(err, "%s only accepts 'check_post' modifier (got '%s').", args[0], args[2]);
return -1; return -1;
} }
if (*args[3]) { if (*args[3]) {
@ -1315,7 +1315,7 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
end = strchr(beg, ')'); end = strchr(beg, ')');
if (!end || end == beg) { if (!end || end == beg) {
snprintf(err, errlen, "'balance hdr(name)' requires an http header field name."); memprintf(err, "hdr requires an http header field name.");
return -1; return -1;
} }
@ -1329,7 +1329,7 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
if (*args[1]) { if (*args[1]) {
if (strcmp(args[1], "use_domain_only")) { if (strcmp(args[1], "use_domain_only")) {
snprintf(err, errlen, "'balance hdr(name)' only accepts 'use_domain_only' modifier."); memprintf(err, "%s only accepts 'use_domain_only' modifier (got '%s').", args[0], args[1]);
return -1; return -1;
} }
curproxy->hh_match_domain = 1; curproxy->hh_match_domain = 1;
@ -1347,7 +1347,7 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
end = strchr(beg, ')'); end = strchr(beg, ')');
if (!end || end == beg) { if (!end || end == beg) {
snprintf(err, errlen, "'balance rdp-cookie(name)' requires an rdp cookie name."); memprintf(err, "rdp-cookie : missing cookie name.");
return -1; return -1;
} }
@ -1361,12 +1361,12 @@ int backend_parse_balance(const char **args, char *err, int errlen, struct proxy
curproxy->hh_len = strlen(curproxy->hh_name); curproxy->hh_len = strlen(curproxy->hh_name);
} }
else { /* syntax */ else { /* syntax */
snprintf(err, errlen, "'balance rdp-cookie(name)' requires an rdp cookie name."); memprintf(err, "rdp-cookie : missing cookie name.");
return -1; return -1;
} }
} }
else { else {
snprintf(err, errlen, "'balance' only supports 'roundrobin', 'static-rr', 'leastconn', 'source', 'uri', 'url_param', 'hdr(name)' and 'rdp-cookie(name)' options."); memprintf(err, "only supports 'roundrobin', 'static-rr', 'leastconn', 'source', 'uri', 'url_param', 'hdr(name)' and 'rdp-cookie(name)' options.");
return -1; return -1;
} }
return 0; return 0;

5
src/cfgparse.c
View File

@ -3963,9 +3963,8 @@ stats_error_parsing:
if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL)) if (warnifnotcap(curproxy, PR_CAP_BE, file, linenum, args[0], NULL))
err_code |= ERR_WARN; err_code |= ERR_WARN;
memcpy(trash, "error near 'balance'", 21); if (backend_parse_balance((const char **)args + 1, &errmsg, curproxy) < 0) {
if (backend_parse_balance((const char **)args + 1, trash, sizeof(trash), curproxy) < 0) { Alert("parsing [%s:%d] : %s %s\n", file, linenum, args[0], errmsg);
Alert("parsing [%s:%d] : %s\n", file, linenum, trash);
err_code |= ERR_ALERT | ERR_FATAL; err_code |= ERR_ALERT | ERR_FATAL;
goto out; goto out;
} }