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 #11962 from spzala/incorrectflag

Browse Source 
logging: create logger to prevent nil pointer
This commit is contained in:
Sahdev Zala 2020-06-09 14:34:22 -04:00 committed by GitHub
commit 84a5ff2d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcdmain/etcd.go
View File

@ -57,6 +57,15 @@ func startEtcdOrProxyV2() {
err := cfg.parse(os.Args[1:]) err := cfg.parse(os.Args[1:])
lg := cfg.ec.GetLogger() lg := cfg.ec.GetLogger()
if lg == nil {
var zapError error
// use this logger
lg, zapError = zap.NewProduction()
if zapError != nil {
fmt.Printf("error creating zap logger %v", zapError)
os.Exit(1)
}
}
if err != nil { if err != nil {
lg.Warn("failed to verify flags", zap.Error(err)) lg.Warn("failed to verify flags", zap.Error(err))
switch err { switch err {