diff options
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server.go | 11 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_write.go | 8 |
2 files changed, 7 insertions, 12 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index fa14159dc..d437f0597 100644 --- a/weed/server/filer_server.go +++ b/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) -} diff --git a/weed/server/volume_server_handlers_write.go b/weed/server/volume_server_handlers_write.go index 0a4c93dac..09b4521fb 100644 --- a/weed/server/volume_server_handlers_write.go +++ b/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) |