gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fix undefined http serve behaiver (#6943)

Browse Source
This commit is contained in:
zuzuviewer
2025-07-08 13:48:12 +08:00
committed by GitHub
parent 39b7e44fb5
commit 8fa1a69f8c
7 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
weed/command/master.go
View File

@@ -2,6 +2,7 @@ package command
import (
"context"
"crypto/tls"
"fmt"
"net/http"
"os"
@@ -264,19 +265,20 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) {
clientCertFile = viper.GetString("https.master.ca")
}
httpS := &http.Server{Handler: r}
if masterLocalListener != nil {
go httpS.Serve(masterLocalListener)
go newHttpServer(r, nil).Serve(masterLocalListener)
}
var tlsConfig *tls.Config
if useMTLS {
httpS.TLSConfig = security.LoadClientTLSHTTP(clientCertFile)
tlsConfig = security.LoadClientTLSHTTP(clientCertFile)
security.FixTlsConfig(util.GetViper(), tlsConfig)
}
if useTLS {
go httpS.ServeTLS(masterListener, certFile, keyFile)
go newHttpServer(r, tlsConfig).ServeTLS(masterListener, certFile, keyFile)
} else {
go httpS.Serve(masterListener)
go newHttpServer(r, nil).Serve(masterListener)
}
grace.OnInterrupt(ms.Shutdown)