github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #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.
pull/6/head
Kubernetes Submit Queue 2016-08-12 12:07:15 -07:00 committed by GitHub
parent 19b2dd17b1 9f3d83efac
commit d933f07835
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/kube-dns/app/server.go
View File

@ -91,8 +91,7 @@ func newKubeClient(dnsConfig *options.KubeDNSConfig) (clientset.Interface, error
} }
} }
glog.Infof("Using %s for kubernetes master", config.Host) glog.Infof("Using %s for kubernetes master, kubernetes API: %v", config.Host, config.GroupVersion)
glog.Infof("Using kubernetes API %v", config.GroupVersion)
return clientset.NewForConfig(config) return clientset.NewForConfig(config)
} }
@ -142,8 +141,8 @@ func (d *KubeDNSServer) startSkyDNSServer() {
s := server.New(d.kd, skydnsConfig) s := server.New(d.kd, skydnsConfig)
if err := metrics.Metrics(); err != nil { if err := metrics.Metrics(); err != nil {
glog.Fatalf("skydns: %s", err) 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() go s.Run()
} }