diff options
| author | yourchanges <yourchanges@gmail.com> | 2015-02-03 14:03:17 +0800 |
|---|---|---|
| committer | yourchanges <yourchanges@gmail.com> | 2015-02-03 14:03:17 +0800 |
| commit | 55c40997b1cd9e33eaa841b8abf5e1678773dd1c (patch) | |
| tree | 58bf1d5986948770b14be49333654286a0bf68be /go/weed/master.go | |
| parent | 133181bbe4ef1676bb12d13574be4314df1b0ac2 (diff) | |
| parent | b13bcdaedac8af6b433ce39172ffdc33e6ef85f9 (diff) | |
| download | seaweedfs-55c40997b1cd9e33eaa841b8abf5e1678773dd1c.tar.xz seaweedfs-55c40997b1cd9e33eaa841b8abf5e1678773dd1c.zip | |
Merge pull request #5 from chrislusf/master
merge
Diffstat (limited to 'go/weed/master.go')
| -rw-r--r-- | go/weed/master.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/go/weed/master.go b/go/weed/master.go index 13f6d7c43..af63d8c22 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -31,7 +31,6 @@ var ( mport = cmdMaster.Flag.Int("port", 9333, "http listen port") masterIp = cmdMaster.Flag.String("ip", "", "master listening ip address, default to listen on all network interfaces") masterBindIp = cmdMaster.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") - mPublicIp = cmdMaster.Flag.String("publicIp", "", "peer accessible <ip>|<server_name>") metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store meta data") masterPeers = cmdMaster.Flag.String("peers", "", "other master nodes in comma separated ip:port list") volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.") @@ -76,19 +75,15 @@ func runMaster(cmd *Command, args []string) bool { go func() { time.Sleep(100 * time.Millisecond) - if *mPublicIp == "" { - if *masterIp == "" { - *mPublicIp = "localhost" - } else { - *mPublicIp = *masterIp - } + if *masterIp == "" { + *masterIp = "localhost" } - myPublicMasterAddress := *mPublicIp + ":" + strconv.Itoa(*mport) + myMasterAddress := *masterIp + ":" + strconv.Itoa(*mport) var peers []string if *masterPeers != "" { peers = strings.Split(*masterPeers, ",") } - raftServer := weed_server.NewRaftServer(r, peers, myPublicMasterAddress, *metaFolder, ms.Topo, *mpulse) + raftServer := weed_server.NewRaftServer(r, peers, myMasterAddress, *metaFolder, ms.Topo, *mpulse) ms.SetRaftServer(raftServer) }() |