mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 12:41:00 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: cli: Use applet API to write output message

Browse Source 
Instead of using the channel API to to write output message from the CLI
applet, we use the applet API. This way, the applet does not need to take
care to request more room it it fails to put its message into the channel's
buffer.
This commit is contained in:
Christopher Faulet 2023-05-05 10:56:00 +02:00
parent b6ae2aafde
commit e8ee27b0fd
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cli.c
View File

@ -845,12 +845,12 @@ fail:
}
/* prepends then outputs the argument msg with a syslog-type severity depending on severity_output value */
static int cli_output_msg(struct channel *chn, const char *msg, int severity, int severity_output)
static int cli_output_msg(struct appctx *appctx, const char *msg, int severity, int severity_output)
{
struct buffer *tmp;
if (likely(severity_output == CLI_SEVERITY_NONE))
return ci_putblk(chn, msg, strlen(msg));
return applet_putstr(appctx, msg);
tmp = get_trash_chunk();
chunk_reset(tmp);
@ -873,7 +873,7 @@ static int cli_output_msg(struct channel *chn, const char *msg, int severity, in
}
chunk_appendf(tmp, "%s", msg);
return ci_putblk(chn, tmp->area, strlen(tmp->area));
return applet_putchk(appctx, tmp);
}
/* This I/O handler runs as an applet embedded in a stream connector. It is
@ -1082,7 +1082,7 @@ static void cli_io_handler(struct appctx *appctx)
msg = "Internal error.\n";
}
if (cli_output_msg(res, msg, sev, cli_get_severity_output(appctx)) != -1) {
if (cli_output_msg(appctx, msg, sev, cli_get_severity_output(appctx)) != -1) {
if (appctx->st0 == CLI_ST_PRINT_DYN ||
appctx->st0 == CLI_ST_PRINT_DYNERR) {
ha_free(&ctx->err);
@ -1093,8 +1093,6 @@ static void cli_io_handler(struct appctx *appctx)
}
appctx->st0 = CLI_ST_PROMPT;
}
else
sc_need_room(sc);
break;
case CLI_ST_CALLBACK: /* use custom pointer */