Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions util/configv3/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package configv3
import (
"encoding/json"
"strconv"
"strings"
"time"

"code.cloudfoundry.org/cli/util/trace"
log "github.com/sirupsen/logrus"
)

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

switch strings.ToLower(config.ENV.CFLogLevel) {
case "fatal":
return 1
case "error":
return 2
case "warn":
return 3
case "info":
return 4
case "debug":
return 5
if level, err := log.ParseLevel(config.ENV.CFLogLevel); err == nil {
return int(level)
}
}

Expand Down
3 changes: 3 additions & 0 deletions util/configv3/env_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ var _ = Describe("Config", func() {
Entry("info returns 4", "info", 4),
Entry("debug returns 5", "debug", 5),
Entry("dEbUg returns 5", "dEbUg", 5),
Entry("trace returns 6", "trace", 6),
Entry("TrAcE returns 6", "TrAcE", 6),
Entry("invalid returns 0", "invalid", 0),
)

Describe("StagingTimeout", func() {
Expand Down
Loading