github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1267 from oistein/log-cmd-output-to-log

Browse Source 
logCmdOutput to logger instead of stdout
This commit is contained in:
Sanskar Jaiswal
2022-09-27 14:39:21 +05:30
committed by GitHub
parent 89b0487376 6d72050e81
commit 1b2df99799
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/loadtester/bash.go
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)
}

2
pkg/loadtester/helmv3.go
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)
}

3
pkg/loadtester/task_shell.go
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)
}