Skip to content

Commit 3644686

Browse files
Removed newTimeEncoder(), returns error on invalid value
1 parent e59b1a3 commit 3644686

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

pkg/log/zap/flags.go

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -106,23 +106,17 @@ func (ev *timeEncoderFlag) Type() string {
106106
}
107107

108108
func (ev *timeEncoderFlag) Set(flagValue string) error {
109-
ev.setFunc(newTimeEncoder(flagValue))
110-
ev.value = flagValue
111-
return nil
112-
}
113-
114-
func newTimeEncoder(flagValue string) zapcore.TimeEncoder {
115109
var encoder zapcore.TimeEncoder
116110
val := strings.ToLower(flagValue)
117111
switch val {
118112
case "iso8601", "rfc3339", "rfc3339nano", "millis", "nanos", "epoch":
119-
if err := encoder.UnmarshalText([]byte(val)); err != nil {
120-
fmt.Printf("not able to unmarshal time encoder value \"%s\"", val)
121-
}
113+
encoder.UnmarshalText([]byte(val))
122114
default:
123-
fmt.Printf("invalid time encoder value \"%s\"", val)
115+
return fmt.Errorf("invalid value for time encoder, \"%s\"", val)
124116
}
125-
return encoder
117+
ev.setFunc(encoder)
118+
ev.value = flagValue
119+
return nil
126120
}
127121

128122
func withTimeEncoding(te zapcore.TimeEncoder) encoderConfigFunc {

0 commit comments

Comments
 (0)