mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-11-30 23:49:10 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix: 解决部分机器监听 IPv4 失败的问题 (#2750)

Browse Source
This commit is contained in:
ssongliu 2023-11-01 10:48:38 +08:00 committed by GitHub
parent 34ca984018
commit 909f8c96e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/server/server.go
View File

@ -4,6 +4,7 @@ import (
"crypto/tls" "crypto/tls"
"encoding/gob" "encoding/gob"
"fmt" "fmt"
"net"
"net/http" "net/http"
"os" "os"
"path" "path"
@ -54,6 +55,13 @@ func Start() {
Addr: global.CONF.System.BindAddress + ":" + global.CONF.System.Port, Addr: global.CONF.System.BindAddress + ":" + global.CONF.System.Port,
Handler: rootRouter, Handler: rootRouter,
} }
ln, err := net.Listen(tcpItem, server.Addr)
if err != nil {
panic(err)
}
type tcpKeepAliveListener struct {
*net.TCPListener
}
if global.CONF.System.SSL == "enable" { if global.CONF.System.SSL == "enable" {
certificate, err := os.ReadFile(path.Join(global.CONF.System.BaseDir, "1panel/secret/server.crt")) certificate, err := os.ReadFile(path.Join(global.CONF.System.BaseDir, "1panel/secret/server.crt"))
if err != nil { if err != nil {
@ -71,12 +79,12 @@ func Start() {
Certificates: []tls.Certificate{cert}, Certificates: []tls.Certificate{cert},
} }
global.LOG.Infof("listen at https://%s:%s [%s]", global.CONF.System.BindAddress, global.CONF.System.Port, tcpItem) global.LOG.Infof("listen at https://%s:%s [%s]", global.CONF.System.BindAddress, global.CONF.System.Port, tcpItem)
if err := server.ListenAndServeTLS("", ""); err != nil {
if err := server.ServeTLS(tcpKeepAliveListener{ln.(*net.TCPListener)}, "", ""); err != nil {
panic(err) panic(err)
} }
} else { } else {
global.LOG.Infof("listen at http://%s:%s [%s]", global.CONF.System.BindAddress, global.CONF.System.Port, tcpItem) if err := server.Serve(tcpKeepAliveListener{ln.(*net.TCPListener)}); err != nil {
if err := server.ListenAndServe(); err != nil {
panic(err) panic(err)
} }
} }