Browse Source

set default volume admin port

pull/96/head
chrislusf 10 years ago
parent
commit
b2f636ab8c
  1. 11
      go/weed/server.go

11
go/weed/server.go

@ -109,6 +109,10 @@ func runServer(cmd *Command, args []string) bool {
*filerOptions.defaultReplicaPlacement = *masterDefaultReplicaPlacement *filerOptions.defaultReplicaPlacement = *masterDefaultReplicaPlacement
} }
if *volumeAdminPort == 0 {
*volumeAdminPort = *volumePort
}
if *serverMaxCpu < 1 { if *serverMaxCpu < 1 {
*serverMaxCpu = runtime.NumCPU() *serverMaxCpu = runtime.NumCPU()
} }
@ -172,7 +176,6 @@ func runServer(cmd *Command, args []string) bool {
) )
if e != nil { if e != nil {
glog.Fatalf("Filer listener error: %v", e) glog.Fatalf("Filer listener error: %v", e)
glog.Fatalf(e.Error())
} }
if e := http.Serve(filerListener, r); e != nil { if e := http.Serve(filerListener, r); e != nil {
glog.Fatalf("Filer Fail to serve: %v", e) 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)) 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), *serverBindIp+":"+strconv.Itoa(*volumePort),
time.Duration(*serverTimeout)*time.Second, 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() { OnInterrupt(func() {

Loading…
Cancel
Save