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

🎨 Improve http server

Browse source 
Signed-off-by: Daniel <845765@qq.com>
This commit is contained in:
Daniel 2025-12-09 11:02:25 +08:00
parent 21dff696cc
commit 106a679dba
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/model/conf.go
View file

@ -745,6 +745,9 @@ func Close(force, setCurrentWorkspace bool, execInstallPkg int) (exitCode int) {
if nil != util.WebSocketServer {
util.WebSocketServer.Close()
}
if nil != util.HttpServer {
util.HttpServer.Close()
}
util.HttpServing = false
if util.ContainerAndroid == util.Container {

6
kernel/server/serve.go
View file

@ -217,7 +217,11 @@ func Serve(fastMode bool) {
// 反代服务器启动失败不影响核心服务器启动
}()
if err = http.Serve(ln, ginServer.Handler()); err != nil {
util.HttpServer = &http.Server{
Handler: ginServer,
}
if err = util.HttpServer.Serve(ln); err != nil {
if !fastMode {
logging.LogErrorf("boot kernel failed: %s", err)
os.Exit(logging.ExitCodeUnavailablePort)

2
kernel/util/working.go
View file

@ -22,6 +22,7 @@ import (
"fmt"
"math/rand"
"mime"
"net/http"
"net/url"
"os"
"path/filepath"
@ -72,6 +73,7 @@ func initEnvVars() {
var (
bootProgress = atomic.Int32{} // 启动进度，从 0 到 100
bootDetails string // 启动细节描述
HttpServer *http.Server // HTTP 伺服器实例
HttpServing = false // 是否 HTTP 伺服已经可用
)