format code.

Author: soarpenguin

cron/collector.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"net"
 	"regexp"
-	"strconv"
 	"time"
 
 	"github.com/golang/glog"
@@ -13,11 +12,6 @@ import (
 	memc "github.com/smallfish/memcache"
 )
 
-//var gaugess = [...]string{"get_hit_ratio", "incr_hit_ratio", "decr_hit_ratio",
-//	"delete_hit_ratio", "usage", "curr_connections", "total_connections",
-//	"bytes", "pointer_size", "uptime", "limit_maxbytes", "threads", "curr_items",
-//	"total_items", "connection_structures"}
-
 var gaugess = map[string]int{"get_hit_ratio": 1, "incr_hit_ratio": 1,
 	"decr_hit_ratio": 1, "delete_hit_ratio": 1, "usage": 1,
 	"curr_connections": 1, "total_connections": 1, "bytes": 1,
@@ -88,41 +82,11 @@ func collect(addrs []string) {
 				}
 			}
 
-			bytes, _ := strconv.ParseFloat(stats["bytes"], 64)
-			limit_maxbytes, _ := strconv.ParseFloat(stats["limit_maxbytes"], 64)
-			stats["usage"] = fmt.Sprintf("%.2f", (100 * bytes / limit_maxbytes))
-
-			if stats["get_hits"] == "0" && stats["get_misses"] == "0" {
-				stats["get_hit_ratio"] = "0.0"
-			} else {
-				get_hits, _ := strconv.ParseFloat(stats["get_hits"], 64)
-				get_misses, _ := strconv.ParseFloat(stats["get_misses"], 64)
-				stats["get_hit_ratio"] = fmt.Sprintf("%.2f", 100*(get_hits/(get_hits+get_misses)))
-			}
-
-			if stats["incr_hits"] == "0" && stats["incr_misses"] == "0" {
-				stats["incr_hit_ratio"] = "0.0"
-			} else {
-				incr_hits, _ := strconv.ParseFloat(stats["incr_hits"], 64)
-				incr_misses, _ := strconv.ParseFloat(stats["incr_misses"], 64)
-				stats["incr_hit_ratio"] = fmt.Sprintf("%.2f", 100*(incr_hits/(incr_hits+incr_misses)))
-			}
-
-			if stats["decr_hits"] == "0" && stats["decr_misses"] == "0" {
-				stats["decr_hit_ratio"] = "0.0"
-			} else {
-				decr_hits, _ := strconv.ParseFloat(stats["decr_hits"], 64)
-				decr_misses, _ := strconv.ParseFloat(stats["decr_misses"], 64)
-				stats["decr_hit_ratio"] = fmt.Sprintf("%.2f", 100*(decr_hits/(decr_hits+decr_misses)))
-			}
-
-			if stats["delete_hits"] == "0" && stats["delete_misses"] == "0" {
-				stats["delete_hit_ratio"] = "0.0"
-			} else {
-				delete_hits, _ := strconv.ParseFloat(stats["delete_hits"], 64)
-				delete_misses, _ := strconv.ParseFloat(stats["delete_misses"], 64)
-				stats["delete_hit_ratio"] = fmt.Sprintf("%.2f", 100*(delete_hits/(delete_hits+delete_misses)))
-			}
+			stats["usage"] = g.CalculateMetricRatio(stats["bytes"], stats["limit_maxbytes"])
+			stats["get_hit_ratio"] = g.CalculateMetricRatio(stats["get_hits"], stats["get_misses"])
+			stats["incr_hit_ratio"] = g.CalculateMetricRatio(stats["incr_hits"], stats["incr_misses"])
+			stats["decr_hit_ratio"] = g.CalculateMetricRatio(stats["decr_hits"], stats["decr_misses"])
+			stats["delete_hit_ratio"] = g.CalculateMetricRatio(stats["delete_hits"], stats["delete_misses"])
 
 			var tags string
 			_, port, err := net.SplitHostPort(addr)

g/cfg.go

@@ -2,7 +2,6 @@ package g
 
 import (
 	"encoding/json"
-	"os"
 	"sync"
 
 	"github.com/golang/glog"
@@ -79,12 +78,3 @@ func ParseConfig(cfg string) {
 
 	glog.Infoln("g:ParseConfig, ok, ", cfg)
 }
-
-// get hostname
-func Hostname() (string, error) {
-	hostname, err := os.Hostname()
-	if err != nil {
-		glog.Warningf("ERROR: os.Hostname() fail %v", err)
-	}
-	return hostname, err
-}

g/git.go

@@ -1,4 +1,4 @@
 package g
 const (
-    COMMIT = "b566ef1"
+    COMMIT = "ff3179a"
 )

g/rpc.go

@@ -93,6 +93,9 @@ func (this *SingleConnRpcClient) Call(method string, args interface{}, reply int
 	return nil
 }
 
+// Set diff metrics send methods for Transfer:
+//      PostToAgent     ->  http://127.0.0.1:1988/v1/push
+//      SendToTransfer  ->  127.0.0.1:8433
 func InitRpcClients() {
 	if Config().Transfer.Enable {
 		taddr := Config().Transfer.Addr

g/util.go

@@ -0,0 +1,50 @@
+package g
+
+import (
+	"fmt"
+	"os"
+	"strconv"
+	"strings"
+
+	"github.com/golang/glog"
+)
+
+// get hostname
+func Hostname() (string, error) {
+	hostname, err := os.Hostname()
+	if err != nil {
+		glog.Warningf("ERROR: os.Hostname() fail %v", err)
+	}
+	return hostname, err
+}
+
+// calculate metric ratio:
+//   string(100 * metrics[0] / sum(metrics))
+func CalculateMetricRatio(metrics ...string) string {
+	if len(metrics) < 1 {
+		return "0"
+	} else if len(metrics) == 1 {
+		return metrics[0]
+	}
+
+	first, err := strconv.ParseFloat(strings.TrimSpace(metrics[0]), 64)
+	if err != nil {
+		return "0"
+	}
+	var total float64 = 0
+
+	for _, metric := range metrics {
+		fmetric, err := strconv.ParseFloat(strings.TrimSpace(metric), 64)
+		if err != nil {
+			total = total + 0
+		} else {
+			total = total + fmetric
+		}
+	}
+
+	if total == 0 {
+		return "0"
+	} else {
+		return fmt.Sprintf("%.2f", 100*(first/total))
+	}
+}

g/util_test.go

@@ -0,0 +1,31 @@
+package g
+
+import (
+	"strings"
+	"testing"
+)
+
+func TestCalculateMetricRatio(t *testing.T) {
+	type CalMetricRadioTest struct {
+		result string
+		opstr  string
+	}
+
+	var tests = []CalMetricRadioTest{
+		{"0.0", "0.0"},
+		{"0", "0.0,0.0"},
+		{"0.00", "0.0,1.0"},
+		{"100.00", "1.0,0.0"},
+		{"50.00", "1.0, 1.0"},
+		{"0", "0.0,a.0"},
+	}
+
+	for _, test := range tests {
+		array := strings.SplitN(test.opstr, ",", -1)
+		ret := CalculateMetricRatio(array...)
+
+		if test.result != ret {
+			t.Errorf("CalculateMetricRatio(%v) = %v, want %v", array, ret, test.result)
+		}
+	}
+}