Merge pull request kubernetes#30184 from ping035627/ping035627-patch-…

…0806 Automatic merge from submit-queue some optimization for server.go The PR modified two places: 1) Optimise the code style according to the go style guide; 2) Optimise the log.
lavalamp · Aug 12, 2016 · d933f07 · d933f07
2 parents 19b2dd1 + 9f3d83e
commit d933f07
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/cmd/kube-dns/app/server.go b/cmd/kube-dns/app/server.go
@@ -91,8 +91,7 @@ func newKubeClient(dnsConfig *options.KubeDNSConfig) (clientset.Interface, error
 		}
 	}
 
-	glog.Infof("Using %s for kubernetes master", config.Host)
-	glog.Infof("Using kubernetes API %v", config.GroupVersion)
+	glog.Infof("Using %s for kubernetes master, kubernetes API: %v", config.Host, config.GroupVersion)
 	return clientset.NewForConfig(config)
 }
 
@@ -142,8 +141,8 @@ func (d *KubeDNSServer) startSkyDNSServer() {
 	s := server.New(d.kd, skydnsConfig)
 	if err := metrics.Metrics(); err != nil {
 		glog.Fatalf("skydns: %s", err)
-	} else {
-		glog.Infof("skydns: metrics enabled on :%s%s", metrics.Port, metrics.Path)
 	}
+	glog.Infof("skydns: metrics enabled on : %s:%s", metrics.Path, metrics.Port)
+
 	go s.Run()
 }