Merge branch 'debug' into 'master'

zhangye · zhangye · commit 9dbbde3ad076 · 2016-12-17T09:05:46.000Z
modify hostname format

See merge request !39
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.12
+0.7.12a
diff --git a/utils/utils.go b/utils/utils.go
@@ -144,7 +144,8 @@ func SendMemCap(cpumemmap map[string]types.CPUAndMem, tag string) {
 		data[node] = float64(cpuandmem.MemCap)
 	}
 	host := os.Getenv("HOSTNAME")
-	err := g.Statsd.Send(data, host, tag)
+	clean_host := strings.Replace(host, ".", "-", -1)
+	err := g.Statsd.Send(data, clean_host, tag)
 	if err != nil {
 		log.Errorf("Error occured while sending data to statsd: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,8 @@ func SendMemCap(cpumemmap map[string]types.CPUAndMem, tag string) {`
`144`	`144`	`data[node] = float64(cpuandmem.MemCap)`
`145`	`145`	`}`
`146`	`146`	`host := os.Getenv("HOSTNAME")`
`147`		`- err := g.Statsd.Send(data, host, tag)`
	`147`	`+ clean_host := strings.Replace(host, ".", "-", -1)`
	`148`	`+ err := g.Statsd.Send(data, clean_host, tag)`
`148`	`149`	`if err != nil {`
`149`	`150`	`log.Errorf("Error occured while sending data to statsd: %v", err)`
`150`	`151`	`}`