diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-09-07 19:29:42 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-09-07 19:29:42 -0700 |
| commit | 574485ec69c1d1a7be8765f5da24d9c23803cb96 (patch) | |
| tree | 2a47c75dd4d8ff84a39eaf2548ba0989c659c07e /weed/command/master_follower.go | |
| parent | 0128239c0f8829bb20edd1df257840dcbfa37c0e (diff) | |
| download | seaweedfs-574485ec69c1d1a7be8765f5da24d9c23803cb96.tar.xz seaweedfs-574485ec69c1d1a7be8765f5da24d9c23803cb96.zip | |
better IP v6 support
Diffstat (limited to 'weed/command/master_follower.go')
| -rw-r--r-- | weed/command/master_follower.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go index b628f7abf..48548a389 100644 --- a/weed/command/master_follower.go +++ b/weed/command/master_follower.go @@ -13,7 +13,6 @@ import ( "github.com/gorilla/mux" "google.golang.org/grpc/reflection" "net/http" - "strconv" "strings" "time" ) @@ -114,7 +113,7 @@ func startMasterFollower(masterOptions MasterOptions) { r := mux.NewRouter() ms := weed_server.NewMasterServer(r, option, masters) - listeningAddress := *masterOptions.ipBind + ":" + strconv.Itoa(*masterOptions.port) + listeningAddress := util.JoinHostPort(*masterOptions.ipBind, *masterOptions.port) glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) masterListener, e := util.NewListener(listeningAddress, 0) if e != nil { @@ -123,7 +122,7 @@ func startMasterFollower(masterOptions MasterOptions) { // starting grpc server grpcPort := *masterOptions.port + 10000 - grpcL, err := util.NewListener(*masterOptions.ipBind+":"+strconv.Itoa(grpcPort), 0) + grpcL, err := util.NewListener(util.JoinHostPort(*masterOptions.ipBind, grpcPort), 0) if err != nil { glog.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err) } |