X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/41e0df276eaaa548e692e44cd8f3c27c4692375e..45828d11792f00d732b7d8e667db8b45b7a0f8b4:/lib/costanalyzer/cmd.go

diff --git a/lib/costanalyzer/cmd.go b/lib/costanalyzer/cmd.go
index c44f328620..f2a7af4933 100644
--- a/lib/costanalyzer/cmd.go
+++ b/lib/costanalyzer/cmd.go
@@ -8,11 +8,11 @@ import (
 	"io"
 	"time"
 
+	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
-	"github.com/sirupsen/logrus"
 )
 
-var Command = &command{}
+var Command = command{}
 
 type command struct {
 	uuids      arrayFlags
@@ -22,25 +22,15 @@ type command struct {
 	end        time.Time
 }
 
-type NoPrefixFormatter struct{}
-
-func (f *NoPrefixFormatter) Format(entry *logrus.Entry) ([]byte, error) {
-	return []byte(entry.Message), nil
-}
-
 // RunCommand implements the subcommand "costanalyzer <collection> <collection> ..."
-func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
+func (c command) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
 	var err error
 	logger := ctxlog.New(stderr, "text", "info")
-	defer func() {
-		if err != nil {
-			logger.Error("\n" + err.Error() + "\n")
-		}
-	}()
-
-	logger.SetFormatter(new(NoPrefixFormatter))
+	logger.SetFormatter(cmd.NoPrefixFormatter{})
 
 	exitcode, err := c.costAnalyzer(prog, args, logger, stdout, stderr)
-
+	if err != nil {
+		logger.Error("\n" + err.Error())
+	}
 	return exitcode
 }