mirror of https://github.com/sirupsen/logrus.git
respect ForceColor and environment variables over OS check
This commit is contained in:
parent
f1b98e4006
commit
d962013756
|
@ -91,7 +91,7 @@ func (f *TextFormatter) init(entry *Entry) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *TextFormatter) isColored() bool {
|
func (f *TextFormatter) isColored() bool {
|
||||||
isColored := f.ForceColors || f.isTerminal
|
isColored := f.ForceColors || (f.isTerminal && (runtime.GOOS != "windows"))
|
||||||
|
|
||||||
if f.EnvironmentOverrideColors {
|
if f.EnvironmentOverrideColors {
|
||||||
if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok && force != "0" {
|
if force, ok := os.LookupEnv("CLICOLOR_FORCE"); ok && force != "0" {
|
||||||
|
@ -103,7 +103,7 @@ func (f *TextFormatter) isColored() bool {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return isColored && !f.DisableColors && (runtime.GOOS != "windows")
|
return isColored && !f.DisableColors
|
||||||
}
|
}
|
||||||
|
|
||||||
// Format renders a single log entry
|
// Format renders a single log entry
|
||||||
|
|
|
@ -444,7 +444,7 @@ func TestTextFormatterIsColored(t *testing.T) {
|
||||||
os.Setenv("CLICOLOR_FORCE", val.clicolorForceVal)
|
os.Setenv("CLICOLOR_FORCE", val.clicolorForceVal)
|
||||||
}
|
}
|
||||||
res := tf.isColored()
|
res := tf.isColored()
|
||||||
if runtime.GOOS == "windows" {
|
if runtime.GOOS == "windows" && !tf.ForceColors && !val.clicolorForceIsSet {
|
||||||
assert.Equal(subT, false, res)
|
assert.Equal(subT, false, res)
|
||||||
} else {
|
} else {
|
||||||
assert.Equal(subT, val.expectedResult, res)
|
assert.Equal(subT, val.expectedResult, res)
|
||||||
|
|
Loading…
Reference in New Issue