Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2024-01-11 21:45:09 +08:00
commit 9a37cfdcda
2 changed files with 13 additions and 1 deletions

View file

@ -18,6 +18,7 @@ package api
import (
"net/http"
"strings"
"github.com/88250/gulu"
"github.com/gin-gonic/gin"
@ -33,7 +34,13 @@ func pushMsg(c *gin.Context) {
return
}
msg := arg["msg"].(string)
msg := strings.TrimSpace(arg["msg"].(string))
if "" == msg {
ret.Code = -1
ret.Msg = "msg can't be empty"
return
}
timeout := 7000
if nil != arg["timeout"] {
timeout = int(arg["timeout"].(float64))

View file

@ -392,6 +392,11 @@ func serveRepoDiff(ginServer *gin.Engine) {
}
func serveDebug(ginServer *gin.Engine) {
if "prod" == util.Mode {
// The production environment will no longer register `/debug/pprof/` https://github.com/siyuan-note/siyuan/issues/10152
return
}
ginServer.GET("/debug/pprof/", gin.WrapF(pprof.Index))
ginServer.GET("/debug/pprof/allocs", gin.WrapF(pprof.Index))
ginServer.GET("/debug/pprof/block", gin.WrapF(pprof.Index))