aboutsummaryrefslogtreecommitdiff
path: root/go/weed/master.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2014-03-25 13:46:59 -0700
committerChris Lu <chris.lu@gmail.com>2014-03-25 13:46:59 -0700
commit39b774a131ac3bc454a516f7b72dcefabc593103 (patch)
tree804763e28b55b1e30ebfefced71b552b8e3e34a1 /go/weed/master.go
parent6e0601a73bf199e7d3ffd3cd2990223e959d3e24 (diff)
downloadseaweedfs-39b774a131ac3bc454a516f7b72dcefabc593103.tar.xz
seaweedfs-39b774a131ac3bc454a516f7b72dcefabc593103.zip
1. adding statistics reporting
2. refactor version to util package
Diffstat (limited to 'go/weed/master.go')
-rw-r--r--go/weed/master.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/go/weed/master.go b/go/weed/master.go
index 2d003185f..1efa0e79c 100644
--- a/go/weed/master.go
+++ b/go/weed/master.go
@@ -56,11 +56,11 @@ func runMaster(cmd *Command, args []string) bool {
}
r := mux.NewRouter()
- ms := weed_server.NewMasterServer(r, VERSION, *mport, *metaFolder,
+ ms := weed_server.NewMasterServer(r, *mport, *metaFolder,
*volumeSizeLimitMB, *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, masterWhiteList,
)
- glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *masterIp+":"+strconv.Itoa(*mport))
+ glog.V(0).Infoln("Start Weed Master", util.VERSION, "at port", *masterIp+":"+strconv.Itoa(*mport))
listener, e := util.NewListener(
*masterIp+":"+strconv.Itoa(*mport),
@@ -76,7 +76,7 @@ func runMaster(cmd *Command, args []string) bool {
if *masterPeers != "" {
peers = strings.Split(*masterPeers, ",")
}
- raftServer := weed_server.NewRaftServer(r, VERSION, peers, *masterIp+":"+strconv.Itoa(*mport), *metaFolder, ms.Topo, *mpulse)
+ raftServer := weed_server.NewRaftServer(r, peers, *masterIp+":"+strconv.Itoa(*mport), *metaFolder, ms.Topo, *mpulse)
ms.SetRaftServer(raftServer)
}()