Repository: trafficserver Updated Branches: refs/heads/master 15fee84b6 -> 60914fa2e
TS-3367: fix traffic_ctl metric zero subcommand Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/60914fa2 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/60914fa2 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/60914fa2 Branch: refs/heads/master Commit: 60914fa2e6dabd7ca6917796651b3602f7df165e Parents: 15fee84 Author: James Peach <[email protected]> Authored: Wed Feb 25 12:40:52 2015 -0800 Committer: James Peach <[email protected]> Committed: Wed Feb 25 12:43:19 2015 -0800 ---------------------------------------------------------------------- cmd/traffic_ctl/metric.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60914fa2/cmd/traffic_ctl/metric.cc ---------------------------------------------------------------------- diff --git a/cmd/traffic_ctl/metric.cc b/cmd/traffic_ctl/metric.cc index 5cfdbc3..fb4da30 100644 --- a/cmd/traffic_ctl/metric.cc +++ b/cmd/traffic_ctl/metric.cc @@ -27,7 +27,7 @@ static int metric_get(unsigned argc, const char ** argv) { if (!CtrlProcessArguments(argc, argv, NULL, 0) || n_file_arguments < 1) { - return CtrlCommandUsage("metric get RECORD [RECORD ...]", NULL, 0); + return CtrlCommandUsage("metric get METRIC [METRIC ...]", NULL, 0); } for (unsigned i = 0; i < n_file_arguments; ++i) { @@ -85,7 +85,7 @@ metric_clear(unsigned argc, const char ** argv) }; if (!CtrlProcessArguments(argc, argv, opts, countof(opts)) || n_file_arguments != 0) { - return CtrlCommandUsage("config clear [OPTIONS]", opts, countof(opts)); + return CtrlCommandUsage("metric clear [OPTIONS]", opts, countof(opts)); } error = TSStatsReset(cluster, NULL); @@ -107,14 +107,14 @@ metric_zero(unsigned argc, const char ** argv) { "cluster", '-', "Zero cluster metrics", "F", &cluster, NULL, NULL }, }; - if (!CtrlProcessArguments(argc, argv, opts, countof(opts)) || n_file_arguments == 0) { - return CtrlCommandUsage("config zero [OPTIONS]", opts, countof(opts)); + if (!CtrlProcessArguments(argc, argv, opts, countof(opts)) || n_file_arguments < 1) { + return CtrlCommandUsage("metric zero [OPTIONS] METRIC [METRIC ...]", opts, countof(opts)); } for (unsigned i = 0; i < n_file_arguments; ++i) { - error = TSStatsReset(cluster, NULL); + error = TSStatsReset(cluster, file_arguments[i]); if (error != TS_ERR_OKAY) { - CtrlMgmtError(error, "failed to clear %smetrics", cluster ? "cluster " : ""); + CtrlMgmtError(error, "failed to clear %s", file_arguments[i]); return CTRL_EX_ERROR; } }
