RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-06 03:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: stats: move a misplaced stats context initialization

Browse Source 
This is a leftover from the cleanup campaign, the stats scope was still
initialized by the CLI instead of being initialized by the stats keyword
parsers. This should probably be backported to 1.7 to make the code more
consistent.
This commit is contained in:
Willy Tarreau 2016-12-16 12:33:47 +01:00
parent ebec3519b0
commit d25fc79d72
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cli.c
View File

@ -454,9 +454,6 @@ static int cli_parse_request(struct appctx *appctx, char *line)
arg++;
}
appctx->ctx.stats.scope_str = 0;
appctx->ctx.stats.scope_len = 0;
appctx->ctx.stats.flags = 0;
appctx->st2 = 0;
kw = cli_find_kw(args);

8
src/stats.c
View File

@ -3096,6 +3096,10 @@ static int cli_parse_clear_counters(char **args, struct appctx *appctx, void *pr
static int cli_parse_show_info(char **args, struct appctx *appctx, void *private)
{
appctx->ctx.stats.scope_str = 0;
appctx->ctx.stats.scope_len = 0;
appctx->ctx.stats.flags = 0;
if (strcmp(args[2], "typed") == 0)
appctx->ctx.stats.flags |= STAT_FMT_TYPED;
return 0;
@ -3104,6 +3108,10 @@ static int cli_parse_show_info(char **args, struct appctx *appctx, void *private
static int cli_parse_show_stat(char **args, struct appctx *appctx, void *private)
{
appctx->ctx.stats.scope_str = 0;
appctx->ctx.stats.scope_len = 0;
appctx->ctx.stats.flags = 0;
if (*args[2] && *args[3] && *args[4]) {
struct proxy *px;