refactoring

weed/server/filer_server.go

@@ -1,7 +1,6 @@
 package weed_server
 
 import (
-	"fmt"
 	"net/http"
 	"os"
 
@@ -88,15 +87,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption)
 		readonlyMux.HandleFunc("/", fs.readonlyFilerHandler)
 	}
 
-	stats.StartPushingMetric("filer", sourceName(option.Port), stats.FilerGather, option.MetricsAddress, option.MetricsIntervalSec)
+	stats.StartPushingMetric("filer", stats.SourceName(option.Port), stats.FilerGather, option.MetricsAddress, option.MetricsIntervalSec)
 
 	return fs, nil
 }
-
-func sourceName(port int) string {
-	hostname, err := os.Hostname()
-	if err != nil {
-		return "unknown"
-	}
-	return fmt.Sprintf("%s_%d", hostname, port)
-}

weed/server/volume_server_handlers_write.go

@@ -19,7 +19,9 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) {
 
 	stats.VolumeServerRequestCounter.WithLabelValues("post").Inc()
 	start := time.Now()
-	defer func() { stats.VolumeServerRequestHistogram.WithLabelValues("post").Observe(time.Since(start).Seconds()) }()
+	defer func() {
+		stats.VolumeServerRequestHistogram.WithLabelValues("post").Observe(time.Since(start).Seconds())
+	}()
 
 	if e := r.ParseForm(); e != nil {
 		glog.V(0).Infoln("form parse error:", e)
@@ -69,7 +71,9 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) {
 
 	stats.VolumeServerRequestCounter.WithLabelValues("delete").Inc()
 	start := time.Now()
-	defer func() { stats.VolumeServerRequestHistogram.WithLabelValues("delete").Observe(time.Since(start).Seconds()) }()
+	defer func() {
+		stats.VolumeServerRequestHistogram.WithLabelValues("delete").Observe(time.Since(start).Seconds())
+	}()
 
 	n := new(needle.Needle)
 	vid, fid, _, _, _ := parseURLPath(r.URL.Path)

weed/stats/metrics.go

@@ -1,6 +1,8 @@
 package stats
 
 import (
+	"fmt"
+	"os"
 	"time"
 
 	"github.com/chrislusf/seaweedfs/weed/glog"
@@ -87,3 +89,11 @@ func loopPushMetrics(name, instance string, gatherer *prometheus.Registry, addr
 		time.Sleep(time.Duration(intervalSeconds) * time.Second)
 	}
 }
+
+func SourceName(port int) string {
+	hostname, err := os.Hostname()
+	if err != nil {
+		return "unknown"
+	}
+	return fmt.Sprintf("%s_%d", hostname, port)
+}