Skip to content

Commit 86c029d

Browse files
authored
Merge pull request #1559 from smallstep/no-color
Allow to disable color in the text formatter
2 parents b66a92c + 00d8d8f commit 86c029d

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

logging/logger.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package logging
33
import (
44
"encoding/json"
55
"net/http"
6+
"os"
67
"strings"
78

89
"github.com/pkg/errors"
@@ -38,6 +39,13 @@ func New(name string, raw json.RawMessage) (*Logger, error) {
3839
var formatter logrus.Formatter
3940
switch strings.ToLower(config.Format) {
4041
case "", "text":
42+
_, noColor := os.LookupEnv("NO_COLOR")
43+
// With EnvironmentOverrideColors set, logrus looks at CLICOLOR and
44+
// CLICOLOR_FORCE
45+
formatter = &logrus.TextFormatter{
46+
DisableColors: noColor,
47+
EnvironmentOverrideColors: true,
48+
}
4149
case "json":
4250
formatter = new(logrus.JSONFormatter)
4351
case "common":

0 commit comments

Comments
 (0)