diff options
| author | chrislu <chris.lu@gmail.com> | 2022-09-17 10:18:14 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-09-17 10:18:14 -0700 |
| commit | 1c79301f89762ed25a431bcb5f4e02858dc02218 (patch) | |
| tree | d0d6c5c44f7524ec38d7002e393d194769278649 /weed/command/master_follower.go | |
| parent | 956ce6416fae66646344782cc7f6f557708eb1f4 (diff) | |
| parent | 3fc261d27c90fc06c1d555dd998d7535b844a746 (diff) | |
| download | seaweedfs-1c79301f89762ed25a431bcb5f4e02858dc02218.tar.xz seaweedfs-1c79301f89762ed25a431bcb5f4e02858dc02218.zip | |
Merge branch 'master' into message_send
Diffstat (limited to 'weed/command/master_follower.go')
| -rw-r--r-- | weed/command/master_follower.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go index 5e5244c05..c4f0cfc3c 100644 --- a/weed/command/master_follower.go +++ b/weed/command/master_follower.go @@ -120,7 +120,7 @@ func startMasterFollower(masterOptions MasterOptions) { ms := weed_server.NewMasterServer(r, option, masters) listeningAddress := util.JoinHostPort(*masterOptions.ipBind, *masterOptions.port) glog.V(0).Infof("Start Seaweed Master %s at %s", util.Version(), listeningAddress) - masterListener, masterLocalListner, e := util.NewIpAndLocalListeners(*masterOptions.ipBind, *masterOptions.port, 0) + masterListener, masterLocalListener, e := util.NewIpAndLocalListeners(*masterOptions.ipBind, *masterOptions.port, 0) if e != nil { glog.Fatalf("Master startup error: %v", e) } @@ -144,8 +144,8 @@ func startMasterFollower(masterOptions MasterOptions) { // start http server httpS := &http.Server{Handler: r} - if masterLocalListner != nil { - go httpS.Serve(masterLocalListner) + if masterLocalListener != nil { + go httpS.Serve(masterLocalListener) } go httpS.Serve(masterListener) |