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 #10313 from lsytj0413/fix-getlogger

Browse Source 
refactor(*): remove duplicate GetLogger
This commit is contained in:
Gyuho Lee 2018-12-10 06:48:02 -08:00 committed by GitHub
commit 15b6a17be4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etcdmain/etcd.go
View File

@ -60,8 +60,8 @@ func startEtcdOrProxyV2() {
defaultInitialCluster := cfg.ec.InitialCluster
err := cfg.parse(os.Args[1:])
lg := cfg.ec.GetLogger()
if err != nil {
lg := cfg.ec.GetLogger()
if lg != nil {
lg.Warn("failed to verify flags", zap.Error(err))
} else {
@ -78,8 +78,6 @@ func startEtcdOrProxyV2() {
os.Exit(1)
}
lg := cfg.ec.GetLogger()
if lg == nil {
// TODO: remove in 3.5
plog.Infof("etcd Version: %s\n", version.Version)