Skip to content

Commit c7ba78d

Browse files
committed
Support "trace" log level [v8]
The "logrus" library supports a "trace=6" log level, but the CLI does not accept the "trace" word for this level. Signed-off-by: Marc Khouzam <marc.khouzam@broadcom.com>
1 parent 2bcb856 commit c7ba78d

2 files changed

Lines changed: 6 additions & 12 deletions

File tree

util/configv3/env.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package configv3
33
import (
44
"encoding/json"
55
"strconv"
6-
"strings"
76
"time"
87

98
"code.cloudfoundry.org/cli/util/trace"
9+
log "github.com/sirupsen/logrus"
1010
)
1111

1212
// EnvOverride represents all the environment variables read by the CF CLI
@@ -115,17 +115,8 @@ func (config *Config) LogLevel() int {
115115
return int(envVal)
116116
}
117117

118-
switch strings.ToLower(config.ENV.CFLogLevel) {
119-
case "fatal":
120-
return 1
121-
case "error":
122-
return 2
123-
case "warn":
124-
return 3
125-
case "info":
126-
return 4
127-
case "debug":
128-
return 5
118+
if level, err := log.ParseLevel(config.ENV.CFLogLevel); err == nil {
119+
return int(level)
129120
}
130121
}
131122

util/configv3/env_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ var _ = Describe("Config", func() {
9696
Entry("info returns 4", "info", 4),
9797
Entry("debug returns 5", "debug", 5),
9898
Entry("dEbUg returns 5", "dEbUg", 5),
99+
Entry("trace returns 6", "trace", 6),
100+
Entry("TrAcE returns 6", "TrAcE", 6),
101+
Entry("invalid returns 0", "invalid", 0),
99102
)
100103

101104
Describe("StagingTimeout", func() {

0 commit comments

Comments
 (0)