RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-10 16:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: cli: "clear table" did not work anymore without a key

Browse Source 
Will Glass-Husain reported this breakage which was caused by commit
dec9814e merged in 1.5-dev12, and which was incomplete, resulting in
both "clear table" and "show table" to do the same thing.

No backport is needed.
This commit is contained in:
Willy Tarreau 2013-04-13 09:22:25 +02:00
parent b1f3af2327
commit 20e993239d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dumpstats.c
View File

@ -3946,17 +3946,19 @@ static void cli_release_handler(struct stream_interface *si)
} }
} }
/* This function dumps all tables' states onto the stream interface's /* This function is used to either dump tables states (when action is set
* read buffer. The xprt_ctx must have been zeroed first, and the flags * to STAT_CLI_O_TAB) or clear tables (when action is STAT_CLI_O_CLR).
* properly set. It returns 0 if the output buffer is full and it needs * The xprt_ctx must have been zeroed first, and the flags properly set.
* to be called again, otherwise non-zero. * It returns 0 if the output buffer is full and it needs to be called
* again, otherwise non-zero.
*/ */
static int stats_table_request(struct stream_interface *si, int show) static int stats_table_request(struct stream_interface *si, int action)
{ {
struct session *s = si->conn->xprt_ctx; struct session *s = si->conn->xprt_ctx;
struct ebmb_node *eb; struct ebmb_node *eb;
int dt; int dt;
int skip_entry; int skip_entry;
int show = action == STAT_CLI_O_TAB;
/* /*
* We have 3 possible states in si->conn->xprt_st : * We have 3 possible states in si->conn->xprt_st :