From 4efdadb17c2a3d2203482e83b669b9f947541b41 Mon Sep 17 00:00:00 2001 From: therecipe Date: Sat, 19 Nov 2016 01:15:43 +0100 Subject: [PATCH] fix utils --- internal/utils/utils.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/internal/utils/utils.go b/internal/utils/utils.go index df156fa9..58ce85cd 100755 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -69,19 +69,21 @@ func GoQtPkgPath(s ...string) string { } func RunCmd(cmd *exec.Cmd, name string) string { - fields := logrus.Fields{"func": "RunCmd", "name": name, "cmd": strings.Join(cmd.Args, "")} - Log.WithFields(fields).Debug("Execute") + fields := logrus.Fields{"func": "RunCmd", "name": name, "cmd": strings.Join(cmd.Args, " ")} + Log.WithFields(fields).Debug("Execute") var out, err = cmd.CombinedOutput() if err != nil { - Log.WithError(err).WithFields(fields).WithField("output", out).Panic("failed to run command") + Log.WithError(err).WithFields(fields).WithField("output", string(out)).Panic("failed to run command") } return string(out) } func RunCmdOptional(cmd *exec.Cmd, name string) string { + fields := logrus.Fields{"func": "RunCmdOptional", "name": name, "cmd": strings.Join(cmd.Args, " ")} + Log.WithFields(fields).Debug("Execute") var out, err = cmd.CombinedOutput() if err != nil { - Log.WithError(err).Errorf("failed to %v\nerror: %s\ncmd: %v", name, out, cmd) + Log.WithError(err).WithFields(fields).WithField("output", string(out)).Error("failed to run command") } return string(out) }