logCmdOutput to logger instead of stdout

Signed-off-by: Øistein Sletten Løvik <oistein@oistein.org>
This commit is contained in:
Øistein Sletten Løvik
2022-09-26 13:52:59 +02:00
committed by Øistein Sletten Løvik
parent 89b0487376
commit 6d72050e81
3 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -43,7 +43,7 @@ func (task *BashTask) Run(ctx context.Context) (*TaskRunResult, error) {
return &TaskRunResult{false, out}, fmt.Errorf("command %s failed: %s: %w", task.command, out, err)
} else {
if task.logCmdOutput {
fmt.Printf("%s\n", out)
task.logger.With("canary", task.canary).Info(string(out))
}
task.logger.With("canary", task.canary).Infof("command finished %s", task.command)
}
+1 -1
View File
@@ -47,7 +47,7 @@ func (task *HelmTaskv3) Run(ctx context.Context) (*TaskRunResult, error) {
return &TaskRunResult{false, out}, fmt.Errorf("command %s failed: %s: %w", task.command, out, err)
} else {
if task.logCmdOutput {
fmt.Printf("%s\n", out)
task.logger.With("canary", task.canary).Info(string(out))
}
task.logger.With("canary", task.canary).Infof("command finished %v", helmCmd)
}
+1 -2
View File
@@ -19,7 +19,6 @@ package loadtester
import (
"context"
"errors"
"fmt"
"os/exec"
"strconv"
@@ -57,7 +56,7 @@ func (task *CmdTask) Run(ctx context.Context) *TaskRunResult {
task.logger.With("canary", task.canary).Errorf("command failed %s %v %s", task.command, err, out)
} else {
if task.logCmdOutput {
fmt.Printf("%s\n", out)
task.logger.With("canary", task.canary).Info(string(out))
}
task.logger.With("canary", task.canary).Infof("command finished %s", task.command)
}