Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14146 from SimFG/parse_config

Browse Source 
config: Add the default case when failing to parse the log rotate config json
This commit is contained in:
Benjamin Wang 2022-06-24 06:13:29 +08:00 committed by GitHub
commit 33ba5380df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/embed/config_logging.go
View File

@ -272,6 +272,8 @@ func setupLogRotation(logOutputs []string, logRotateConfigJSON string) error {
return fmt.Errorf("improperly formatted log rotation config: %v", err) return fmt.Errorf("improperly formatted log rotation config: %v", err)
case errors.As(err, &unmarshalTypeError): case errors.As(err, &unmarshalTypeError):
return fmt.Errorf("invalid log rotation config: %v", err) return fmt.Errorf("invalid log rotation config: %v", err)
default:
return fmt.Errorf("fail to unmarshal log rotation config: %v", err)
} }
} }
zap.RegisterSink("rotate", func(u *url.URL) (zap.Sink, error) { zap.RegisterSink("rotate", func(u *url.URL) (zap.Sink, error) {