RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: vars/cli: fix missing LF after "get var" output 

"get var" on the CLI was also missing an LF, and the vtest as well, so
that fixing only the code breaks the vtest. This must be backported to
2.4 as the issue was brought with commit c35eb38f1d ("MINOR: vars/cli:
add a "get var" CLI command to retrieve global variables").
This commit is contained in:
Willy Tarreau 2024-02-08 18:13:32 +01:00
parent eaeb67bdb4
commit 5d0dd88ac6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reg-tests/sample_fetches/vars.vtc
View File

@ -34,7 +34,7 @@ haproxy h1 -conf {
haproxy h1 -cli { haproxy h1 -cli {
send "get var proc.int5" send "get var proc.int5"
expect ~ "^proc.int5: type=sint value=<5>$" expect ~ "^proc.int5: type=sint value=<5>"
} }
client c1 -connect ${h1_fe1_sock} { client c1 -connect ${h1_fe1_sock} {
@ -51,7 +51,7 @@ client c1 -connect ${h1_fe1_sock} {
haproxy h1 -cli { haproxy h1 -cli {
send "get var proc.int5" send "get var proc.int5"
expect ~ "^proc.int5: type=sint value=<10>$" expect ~ "^proc.int5: type=sint value=<10>"
} }
client c2 -connect ${h1_fe1_sock} { client c2 -connect ${h1_fe1_sock} {
@ -68,7 +68,7 @@ client c2 -connect ${h1_fe1_sock} {
haproxy h1 -cli { haproxy h1 -cli {
send "get var proc.int5" send "get var proc.int5"
expect ~ "^proc.int5: type=sint value=<20>$" expect ~ "^proc.int5: type=sint value=<20>"
} }
haproxy h1 -cli { haproxy h1 -cli {

3
src/vars.c
View File

@ -1158,7 +1158,7 @@ static int vars_parse_cli_get_var(char **args, char *payload, struct appctx *app
if (!sample_casts[smp.data.type][SMP_T_STR] || if (!sample_casts[smp.data.type][SMP_T_STR] ||
!sample_casts[smp.data.type][SMP_T_STR](&smp)) { !sample_casts[smp.data.type][SMP_T_STR](&smp)) {
chunk_appendf(&trash, "(undisplayable)"); chunk_appendf(&trash, "(undisplayable)\n");
} else { } else {
/* Display the displayable chars*. */ /* Display the displayable chars*. */
b_putchr(&trash, '<'); b_putchr(&trash, '<');
@ -1169,6 +1169,7 @@ static int vars_parse_cli_get_var(char **args, char *payload, struct appctx *app
b_putchr(&trash, '.'); b_putchr(&trash, '.');
} }
b_putchr(&trash, '>'); b_putchr(&trash, '>');
b_putchr(&trash, '\n');
b_putchr(&trash, 0); b_putchr(&trash, 0);
} }
return cli_msg(appctx, LOG_INFO, trash.area); return cli_msg(appctx, LOG_INFO, trash.area);