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/volume.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/volume.go')
| -rw-r--r-- | go/weed/volume.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/go/weed/volume.go b/go/weed/volume.go index 17d03f0c5..212cb4b33 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -1,15 +1,16 @@ 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" "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" ) func init() { @@ -30,7 +31,7 @@ var ( maxVolumeCounts = cmdVolume.Flag.String("max", "7", "maximum numbers of volumes, count[,count]...") ip = cmdVolume.Flag.String("ip", "", "ip or server name") publicIp = cmdVolume.Flag.String("publicIp", "", "Publicly accessible <ip|server_name>") - bindIp = cmdVolume.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") + volumeBindIp = cmdVolume.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") masterNode = cmdVolume.Flag.String("mserver", "localhost:9333", "master server location") vpulse = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats, must be smaller than or equal to the master's setting") vTimeout = cmdVolume.Flag.Int("idleTimeout", 10, "connection idle seconds") @@ -85,7 +86,7 @@ func runVolume(cmd *Command, args []string) bool { *fixJpgOrientation, ) - listeningAddress := *bindIp + ":" + strconv.Itoa(*vport) + listeningAddress := *volumeBindIp + ":" + strconv.Itoa(*vport) glog.V(0).Infoln("Start Seaweed volume server", util.VERSION, "at", listeningAddress) |