Merge pull request #712 from loadimpact/logger-fixes

Fix a bug with --no-color and wrap Go's std logger with logrus
grafana · Jul 16, 2018 · 7796615 · 7796615
2 parents c7b2516 + e56f969
commit 7796615
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -23,6 +23,7 @@ package cmd
 import (
 	"fmt"
 	"io"
+	golog "log"
 	"os"
 	"path/filepath"
 	"sync"
@@ -74,8 +75,9 @@ var RootCmd = &cobra.Command{
 		setupLoggers(logFmt)
 		if noColor {
 			stdout.Writer = colorable.NewNonColorable(os.Stdout)
-			stdout.Writer = colorable.NewNonColorable(os.Stderr)
+			stderr.Writer = colorable.NewNonColorable(os.Stderr)
 		}
+		golog.SetOutput(log.StandardLogger().Writer())
 	},
 }
 

diff --git a/release notes/upcoming.md b/release notes/upcoming.md
@@ -10,4 +10,5 @@ Description of feature.
 
 ## Bugs fixed!
 
-* Category: description of bug. (#PR)
+* Logging: using the `--no-color` flag caused k6 to print output intended for `sdtout` to `stderr` instead. (#712)
+* Logging: some error messages originating from Go's standard library did not obey the `--logformat` option. (#712)