diff options
| author | Brian McQueen <bmcquee@l-sclX1Q0DV7-M.local> | 2014-12-14 00:13:51 -0800 |
|---|---|---|
| committer | Brian McQueen <bmcquee@l-sclX1Q0DV7-M.local> | 2014-12-14 00:13:51 -0800 |
| commit | a3583e4e7cdba69346397b963193eda9ed10c3a3 (patch) | |
| tree | 5c984294280a16779c416a90f0f19e28cb98e7f4 /go/weed/master.go | |
| parent | bd664def45925d81dfae9c7edfb244d2367170ca (diff) | |
| parent | e431d4121e8da8d7fc243b29b780c2cd535a4210 (diff) | |
| download | seaweedfs-a3583e4e7cdba69346397b963193eda9ed10c3a3.tar.xz seaweedfs-a3583e4e7cdba69346397b963193eda9ed10c3a3.zip | |
Merge branch 'master' of https://github.com/chrislusf/weed-fs
Diffstat (limited to 'go/weed/master.go')
| -rw-r--r-- | go/weed/master.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/go/weed/master.go b/go/weed/master.go index 6617c8ca6..f88964b6d 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -1,16 +1,17 @@ package main import ( - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/util" - "github.com/chrislusf/weed-fs/go/weed/weed_server" - "github.com/gorilla/mux" "net/http" "os" "runtime" "strconv" "strings" "time" + + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/weed/weed_server" + "github.com/gorilla/mux" ) func init() { @@ -29,6 +30,7 @@ var cmdMaster = &Command{ 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") @@ -61,7 +63,7 @@ func runMaster(cmd *Command, args []string) bool { *volumeSizeLimitMB, *mpulse, *confFile, *defaultReplicaPlacement, *garbageThreshold, masterWhiteList, ) - listeningAddress := *masterIp + ":" + strconv.Itoa(*mport) + listeningAddress := *masterBindIp + ":" + strconv.Itoa(*mport) glog.V(0).Infoln("Start Seaweed Master", util.VERSION, "at", listeningAddress) |