adjust for metrics port

2 files changed, 2 insertions, 6 deletions

diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index de271a483..ec0a4fb3e 100644
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -54,7 +54,6 @@ type FilerOption struct {
 	recursiveDelete    bool
 	Cipher             bool
 	Filers             []string
-	MetricsHttpPort    int
 }
 
 type FilerServer struct {
@@ -158,8 +157,7 @@ func (fs *FilerServer) maybeStartMetrics() {
 		}
 	}
 
-	go stats.StartMetricsServer(stats.FilerGather, fs.option.MetricsHttpPort)
-	go stats.LoopPushingMetric("filer", stats.SourceName(fs.option.Port), stats.FilerGather, fs.metricsAddress, fs.metricsIntervalSec)
+	go stats.LoopPushingMetric("filer", stats.SourceName(fs.option.Port), fs.metricsAddress, fs.metricsIntervalSec)
 }
 
 func readFilerConfiguration(grpcDialOption grpc.DialOption, masterAddress string) (metricsAddress string, metricsIntervalSec int, err error) {
diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go
index 2a9097f01..83df32fdd 100644
--- a/weed/server/volume_server.go
+++ b/weed/server/volume_server.go
@@ -46,7 +46,6 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
 	readRedirect bool,
 	compactionMBPerSecond int,
 	fileSizeLimitMB int,
-	metricsHttpPort int,
 ) *VolumeServer {
 
 	v := util.GetViper()
@@ -98,8 +97,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string,
 	}
 
 	go vs.heartbeat()
-	go stats.StartMetricsServer(stats.VolumeServerGather, metricsHttpPort)
-	go stats.LoopPushingMetric("volumeServer", fmt.Sprintf("%s:%d", ip, port), stats.VolumeServerGather, vs.metricsAddress, vs.metricsIntervalSec)
+	go stats.LoopPushingMetric("volumeServer", fmt.Sprintf("%s:%d", ip, port), vs.metricsAddress, vs.metricsIntervalSec)
 
 	return vs
 }