diff options
| author | chrislusf <chris.lu@gmail.com> | 2015-02-25 21:28:55 -0800 |
|---|---|---|
| committer | chrislusf <chris.lu@gmail.com> | 2015-02-25 23:59:44 -0800 |
| commit | b2f636ab8c6012c2b5b63feade4438110357e5e2 (patch) | |
| tree | 5ca50145d040636265d4b45b11b6763f4354990f | |
| parent | 4ee766e966aba41cd6d60b5449b080ee0922693c (diff) | |
| download | seaweedfs-b2f636ab8c6012c2b5b63feade4438110357e5e2.tar.xz seaweedfs-b2f636ab8c6012c2b5b63feade4438110357e5e2.zip | |
set default volume admin port
| -rw-r--r-- | go/weed/server.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/go/weed/server.go b/go/weed/server.go index a758f887f..dd05d035a 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -109,6 +109,10 @@ func runServer(cmd *Command, args []string) bool { *filerOptions.defaultReplicaPlacement = *masterDefaultReplicaPlacement } + if *volumeAdminPort == 0 { + *volumeAdminPort = *volumePort + } + if *serverMaxCpu < 1 { *serverMaxCpu = runtime.NumCPU() } @@ -172,7 +176,6 @@ func runServer(cmd *Command, args []string) bool { ) if e != nil { glog.Fatalf("Filer listener error: %v", e) - glog.Fatalf(e.Error()) } if e := http.Serve(filerListener, r); e != nil { glog.Fatalf("Filer Fail to serve: %v", e) @@ -229,12 +232,12 @@ func runServer(cmd *Command, args []string) bool { ) glog.V(0).Infoln("Start Seaweed volume server", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*volumePort)) - volumeListener, e := util.NewListener( + volumeListener, eListen := util.NewListener( *serverBindIp+":"+strconv.Itoa(*volumePort), time.Duration(*serverTimeout)*time.Second, ) - if e != nil { - glog.Fatalf("Volume server listener error: %v", e) + if eListen != nil { + glog.Fatalf("Volume server listener error: %v", eListen) } OnInterrupt(func() { |