Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 桌面端内核进程使用随机端口 https://github.com/siyuan-note/siyuan/issues/4952

Browse source
This commit is contained in:
Liang Ding 2022-10-25 15:31:48 +08:00
parent b75b878ff3
commit 14dcf78cd9
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
kernel/server/serve.go
View file

@ -20,7 +20,9 @@ import (
"fmt" "fmt"
"net" "net"
"net/http" "net/http"
"net/http/httputil"
"net/http/pprof" "net/http/pprof"
"net/url"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
@ -79,7 +81,7 @@ func Serve(fastMode bool) {
host = "127.0.0.1" host = "127.0.0.1"
} }
ln, err := net.Listen("tcp", ":"+util.ServerPort) ln, err := net.Listen("tcp", host+":"+util.ServerPort)
if nil != err { if nil != err {
if !fastMode { if !fastMode {
logging.LogErrorf("boot kernel failed: %s", err) logging.LogErrorf("boot kernel failed: %s", err)
@ -103,6 +105,17 @@ func Serve(fastMode bool) {
logging.LogInfof("kernel [pid=%s] is booting [%s]", pid, "http://"+host+":"+port) logging.LogInfof("kernel [pid=%s] is booting [%s]", pid, "http://"+host+":"+port)
util.HttpServing = true util.HttpServing = true
go func() {
if util.FixedPort != port {
serverURL, _ := url.Parse("http://" + host + ":" + port)
proxy := httputil.NewSingleHostReverseProxy(serverURL)
logging.LogInfof("kernel reverse proxy server [%s] is booting", util.FixedPort)
if proxyErr := http.ListenAndServe(host+":"+util.FixedPort, proxy); nil != proxyErr {
logging.LogErrorf("boot kernel reverse proxy server failed: %s", serverURL, proxyErr)
}
}
}()
if err = http.Serve(ln, ginServer); nil != err { if err = http.Serve(ln, ginServer); nil != err {
if !fastMode { if !fastMode {
logging.LogErrorf("boot kernel failed: %s", err) logging.LogErrorf("boot kernel failed: %s", err)