Skip to content

Commit f3e077d

Browse files
Fix zap levels to align with logr
1 parent 32ec631 commit f3e077d

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

pkg/log/zap/flags.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ var levelStrings = map[string]zapcore.Level{
3434
"error": zap.ErrorLevel,
3535
}
3636

37+
var stackLevelStrings = map[string]zapcore.Level{
38+
"disabled": zap.FatalLevel,
39+
"info": zap.InfoLevel,
40+
"error": zap.ErrorLevel,
41+
}
42+
3743
type encoderFlag struct {
3844
setFunc func(zapcore.Encoder)
3945
value string
@@ -87,7 +93,7 @@ func (ev *levelFlag) Set(flagValue string) error {
8793
if err != nil {
8894
return fmt.Errorf("invalid log level \"%s\"", flagValue)
8995
}
90-
if logLevel > 0 {
96+
if logLevel >= 0 {
9197
intLevel := -1 * logLevel
9298
ev.setFunc(zap.NewAtomicLevelAt(zapcore.Level(int8(intLevel))))
9399
} else {
@@ -116,7 +122,7 @@ type stackTraceFlag struct {
116122
var _ pflag.Value = &stackTraceFlag{}
117123

118124
func (ev *stackTraceFlag) Set(flagValue string) error {
119-
level, validLevel := levelStrings[strings.ToLower(flagValue)]
125+
level, validLevel := stackLevelStrings[strings.ToLower(flagValue)]
120126
if !validLevel {
121127
return fmt.Errorf("invalid stacktrace level \"%s\"", flagValue)
122128
}

0 commit comments

Comments
 (0)