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

MINOR: appctx/cli: remove the "be" entry from the appctx union

Browse Source 
This one now migrates to the general purpose cli.p0. The parsing
function was removed since it was only used to set the pointer to
NULL.
This commit is contained in:
Willy Tarreau 2016-12-16 18:01:15 +01:00
parent f6710f8811
commit 608ea5921a
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/applet.h
View File

@ -162,9 +162,6 @@ struct appctx {
struct proxy *px; /* current proxy being dumped, NULL = not started yet. */
struct server *sv; /* current server being dumped, NULL = not started yet. */
} server_state;
struct {
struct proxy *px; /* current proxy being dumped, NULL = not started yet. */
} be; /* used by "show backends" command */
/* NOTE: please add regular applet contexts (ie: not
* CLI-specific ones) above, before "cli".
*/

20
src/proxy.c
View File

@ -1369,13 +1369,9 @@ static int cli_io_handler_servers_state(struct appctx *appctx)
return 1;
}
static int cli_parse_show_backend(char **args, struct appctx *appctx, void *private)
{
appctx->ctx.be.px = NULL;
return 0;
}
/* Parses backend list and simply report backend names */
/* Parses backend list and simply report backend names. It keeps the proxy
* pointer in cli.p0.
*/
static int cli_io_handler_show_backend(struct appctx *appctx)
{
extern struct proxy *proxy;
@ -1384,17 +1380,17 @@ static int cli_io_handler_show_backend(struct appctx *appctx)
chunk_reset(&trash);
if (!appctx->ctx.be.px) {
if (!appctx->ctx.cli.p0) {
chunk_printf(&trash, "# name\n");
if (bi_putchk(si_ic(si), &trash) == -1) {
si_applet_cant_put(si);
return 0;
}
appctx->ctx.be.px = proxy;
appctx->ctx.cli.p0 = proxy;
}
for (; appctx->ctx.be.px != NULL; appctx->ctx.be.px = curproxy->next) {
curproxy = appctx->ctx.be.px;
for (; appctx->ctx.cli.p0 != NULL; appctx->ctx.cli.p0 = curproxy->next) {
curproxy = appctx->ctx.cli.p0;
/* looking for backends only */
if (!(curproxy->cap & PR_CAP_BE))
@ -1553,7 +1549,7 @@ static struct cli_kw_list cli_kws = {{ },{
{ { "enable", "frontend", NULL }, "enable frontend : re-enable specific frontend", cli_parse_enable_frontend, NULL, NULL },
{ { "set", "maxconn", "frontend", NULL }, "set maxconn frontend : change a frontend's maxconn setting", cli_parse_set_maxconn_frontend, NULL },
{ { "show","servers", "state", NULL }, "show servers state [id]: dump volatile server information (for backend <id>)", cli_parse_show_servers, cli_io_handler_servers_state },
{ { "show", "backend", NULL }, "show backend : list backends in the current running config", cli_parse_show_backend, cli_io_handler_show_backend },
{ { "show", "backend", NULL }, "show backend : list backends in the current running config", NULL, cli_io_handler_show_backend },
{ { "shutdown", "frontend", NULL }, "shutdown frontend : stop a specific frontend", cli_parse_shutdown_frontend, NULL, NULL },
{{},}
}};