From 355d55bd349e7ca6360f626279858c31cfc59898 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Wed, 30 Jan 2019 14:02:15 +0100 Subject: cmd/swarm/swarm-smoke: remove wrong metrics (#18970) (cherry picked from commit c5c9cef5c0baf1652b6642858ad2426794823699) --- cmd/swarm/swarm-smoke/util.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd/swarm/swarm-smoke/util.go') diff --git a/cmd/swarm/swarm-smoke/util.go b/cmd/swarm/swarm-smoke/util.go index 2a3083bf5..003973d41 100644 --- a/cmd/swarm/swarm-smoke/util.go +++ b/cmd/swarm/swarm-smoke/util.go @@ -46,12 +46,12 @@ var ( func wrapCliCommand(name string, killOnTimeout bool, command func(*cli.Context) error) func(*cli.Context) error { return func(ctx *cli.Context) error { log.PrintOrigins(true) - log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(os.Stdout, log.TerminalFormat(true)))) + log.Root().SetHandler(log.LvlFilterHandler(log.Lvl(verbosity), log.StreamHandler(os.Stdout, log.TerminalFormat(false)))) + defer func(now time.Time) { totalTime := time.Since(now) - - log.Info("total time", "time", totalTime) - metrics.GetOrRegisterCounter(name+".total-time", nil).Inc(int64(totalTime)) + log.Info("total time", "time", totalTime, "kb", filesize) + metrics.GetOrRegisterResettingTimer(name+".total-time", nil).Update(totalTime) }(time.Now()) log.Info("smoke test starting", "task", name, "timeout", timeout) -- cgit v1.2.3