diff options
| author | Chris Lu <chris.lu@gmail.com> | 2015-02-26 16:51:40 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2015-02-26 16:51:40 -0800 |
| commit | 5f9efceee305e68e53d3f0b844278f3b599d71e9 (patch) | |
| tree | 66ddfebdca95fe71c72d0f8e19b92f61048bac6f /go/weed/server.go | |
| parent | 25efb4debe48746d8e0bfb18176728f873193a97 (diff) | |
| parent | a091e6f3bcea9a51c41cc0b7c44b0b060630939e (diff) | |
| download | seaweedfs-5f9efceee305e68e53d3f0b844278f3b599d71e9.tar.xz seaweedfs-5f9efceee305e68e53d3f0b844278f3b599d71e9.zip | |
Merge branch 'master' of github.com:chrislusf/weed-fs
Diffstat (limited to 'go/weed/server.go')
| -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() { |