diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-30 07:58:49 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-06-30 07:58:49 +0800 |
| commit | e896cab82ccad8f1c4fb13892d67ba7452948403 (patch) | |
| tree | b2967ce1ed56ae19660319e8bb7a849698187a74 /cmd/geth/monitorcmd.go | |
| parent | 7c4ed8055cc036214279e3ebded74c58d6808d05 (diff) | |
| parent | 5f3792c2a750dd95adeccbd5cf0cb19ecddfb43f (diff) | |
| download | dexon-e896cab82ccad8f1c4fb13892d67ba7452948403.tar dexon-e896cab82ccad8f1c4fb13892d67ba7452948403.tar.gz dexon-e896cab82ccad8f1c4fb13892d67ba7452948403.tar.bz2 dexon-e896cab82ccad8f1c4fb13892d67ba7452948403.tar.lz dexon-e896cab82ccad8f1c4fb13892d67ba7452948403.tar.xz dexon-e896cab82ccad8f1c4fb13892d67ba7452948403.tar.zst dexon-e896cab82ccad8f1c4fb13892d67ba7452948403.zip | |
Merge pull request #1360 from obscuren/peter-metrics
Rebased peter's PR
Diffstat (limited to 'cmd/geth/monitorcmd.go')
| -rw-r--r-- | cmd/geth/monitorcmd.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmd/geth/monitorcmd.go b/cmd/geth/monitorcmd.go index fe771b561..6593b3614 100644 --- a/cmd/geth/monitorcmd.go +++ b/cmd/geth/monitorcmd.go @@ -75,7 +75,12 @@ func monitor(ctx *cli.Context) { if len(monitored) == 0 { list := expandMetrics(metrics, "") sort.Strings(list) - utils.Fatalf("No metrics specified.\n\nAvailable:\n - %s", strings.Join(list, "\n - ")) + + if len(list) > 0 { + utils.Fatalf("No metrics specified.\n\nAvailable:\n - %s", strings.Join(list, "\n - ")) + } else { + utils.Fatalf("No metrics collected by geth (--%s).\n", utils.MetricsEnabledFlag.Name) + } } sort.Strings(monitored) if cols := len(monitored) / ctx.Int(monitorCommandRowsFlag.Name); cols > 6 { @@ -285,7 +290,7 @@ func updateChart(metric string, data []float64, base *int, chart *termui.LineCha } // Update the chart's label with the scale units units := dataUnits - if strings.Contains(metric, "/Percentiles/") || strings.Contains(metric, "/pauses/") { + if strings.Contains(metric, "/Percentiles/") || strings.Contains(metric, "/pauses/") || strings.Contains(metric, "/time/") { units = timeUnits } chart.Border.Label = metric |