aboutsummaryrefslogtreecommitdiff
path: root/weed/command/master_follower.go
diff options
context:
space:
mode:
authorzuzuviewer <750938164@qq.com>2025-07-08 13:48:12 +0800
committerGitHub <noreply@github.com>2025-07-07 22:48:12 -0700
commit8fa1a69f8c915311326e75645681d10f66d9e222 (patch)
treec262e32f0764804cac5356fdadd1229a915f4649 /weed/command/master_follower.go
parent39b7e44fb58d18bb3a1c118e878748a43f18757b (diff)
downloadseaweedfs-8fa1a69f8c915311326e75645681d10f66d9e222.tar.xz
seaweedfs-8fa1a69f8c915311326e75645681d10f66d9e222.zip
* Fix undefined http serve behaiver (#6943)
Diffstat (limited to 'weed/command/master_follower.go')
-rw-r--r--weed/command/master_follower.go11
1 files changed, 5 insertions, 6 deletions
diff --git a/weed/command/master_follower.go b/weed/command/master_follower.go
index 17beaa7ec..43707946d 100644
--- a/weed/command/master_follower.go
+++ b/weed/command/master_follower.go
@@ -3,19 +3,19 @@ package command
import (
"context"
"fmt"
- "github.com/seaweedfs/seaweedfs/weed/util/version"
- "net/http"
"time"
"github.com/aws/aws-sdk-go/aws"
"github.com/gorilla/mux"
+ "google.golang.org/grpc/reflection"
+
"github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/pb"
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
"github.com/seaweedfs/seaweedfs/weed/security"
weed_server "github.com/seaweedfs/seaweedfs/weed/server"
"github.com/seaweedfs/seaweedfs/weed/util"
- "google.golang.org/grpc/reflection"
+ "github.com/seaweedfs/seaweedfs/weed/util/version"
)
var (
@@ -144,11 +144,10 @@ func startMasterFollower(masterOptions MasterOptions) {
go ms.MasterClient.KeepConnectedToMaster(context.Background())
// start http server
- httpS := &http.Server{Handler: r}
if masterLocalListener != nil {
- go httpS.Serve(masterLocalListener)
+ go newHttpServer(r, nil).Serve(masterLocalListener)
}
- go httpS.Serve(masterListener)
+ go newHttpServer(r, nil).Serve(masterListener)
select {}
}