diff options
| author | Chris Lu <chris.lu@gmail.com> | 2013-12-03 23:22:26 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2013-12-03 23:22:26 -0800 |
| commit | 5fdb1d89cebbb2f4947a1d2b356b83f90b951239 (patch) | |
| tree | a4524eddb303c44953e93a9945249ee50541e8fc /go/weed/master.go | |
| parent | eeeccf2f7847266067473c31c73a5e42eec902c1 (diff) | |
| download | seaweedfs-5fdb1d89cebbb2f4947a1d2b356b83f90b951239.tar.xz seaweedfs-5fdb1d89cebbb2f4947a1d2b356b83f90b951239.zip | |
adding "server" command to start both volume server and an embedded
master server
Diffstat (limited to 'go/weed/master.go')
| -rw-r--r-- | go/weed/master.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/go/weed/master.go b/go/weed/master.go index f4c2ed087..a1dffe5ac 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -28,7 +28,7 @@ var cmdMaster = &Command{ var ( mport = cmdMaster.Flag.Int("port", 9333, "http listen port") mip = cmdMaster.Flag.String("ip", "localhost", "http listen port") - metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store mappings") + metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store meta data") volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes") mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "xml configuration file") @@ -58,7 +58,7 @@ func runMaster(cmd *Command, args []string) bool { glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *mip+":"+strconv.Itoa(*mport)) srv := &http.Server{ - Addr: *mip+":" + strconv.Itoa(*mport), + Addr: *mip + ":" + strconv.Itoa(*mport), Handler: r, ReadTimeout: time.Duration(*mReadTimeout) * time.Second, } |