mirror of
https://github.com/siyuan-note/siyuan.git
synced 2026-02-09 08:44:20 +01:00
♻️ Refactor Go to err != nil, err == nil (#12385)
This commit is contained in:
Oleksandr Redko
GitHub
parent
473a159ef2
commit
b100721fee
147 changed files with 1661 additions and 1659 deletions
|
|
@ -38,7 +38,7 @@ func killRunningKernel() {
|
|||
defer logging.LogInfof("check running kernel elapsed [%dms]", time.Since(now).Milliseconds())
|
||||
|
||||
processes, err := goPS.Processes()
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("get processes failed: %s", err)
|
||||
killByPort(util.FixedPort)
|
||||
return
|
||||
|
|
@ -102,7 +102,7 @@ func pidByPort(port string) (ret string) {
|
|||
cmd := exec.Command("cmd", "/c", "netstat -ano | findstr "+port)
|
||||
gulu.CmdAttr(cmd)
|
||||
data, err := cmd.CombinedOutput()
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("netstat failed: %s", err)
|
||||
return
|
||||
}
|
||||
|
|
@ -122,7 +122,7 @@ func pidByPort(port string) (ret string) {
|
|||
cmd := exec.Command("lsof", "-Fp", "-i", ":"+port)
|
||||
gulu.CmdAttr(cmd)
|
||||
data, err := cmd.CombinedOutput()
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("lsof failed: %s", err)
|
||||
return
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ func initPublishListener() (err error) {
|
|||
}
|
||||
|
||||
_, Port, err = net.SplitHostPort(listener.Addr().String())
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("split host and port failed: %s", err)
|
||||
return
|
||||
}
|
||||
|
|
@ -110,7 +110,7 @@ func closePublishListener() (err error) {
|
|||
func startPublishReverseProxyService() {
|
||||
logging.LogInfof("publish service [%s:%s] is running", Host, Port)
|
||||
// 服务进行时一直阻塞
|
||||
if err := http.Serve(listener, proxy); nil != err {
|
||||
if err := http.Serve(listener, proxy); err != nil {
|
||||
if listener != nil {
|
||||
logging.LogErrorf("boot publish service failed: %s", err)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ func Serve(fastMode bool) {
|
|||
}
|
||||
|
||||
ln, err := net.Listen("tcp", host+":"+util.ServerPort)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
if !fastMode {
|
||||
logging.LogErrorf("boot kernel failed: %s", err)
|
||||
os.Exit(logging.ExitCodeUnavailablePort)
|
||||
|
|
@ -107,7 +107,7 @@ func Serve(fastMode bool) {
|
|||
}
|
||||
|
||||
_, port, err := net.SplitHostPort(ln.Addr().String())
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
if !fastMode {
|
||||
logging.LogErrorf("boot kernel failed: %s", err)
|
||||
os.Exit(logging.ExitCodeUnavailablePort)
|
||||
|
|
@ -136,7 +136,7 @@ func Serve(fastMode bool) {
|
|||
// 反代服务器启动失败不影响核心服务器启动
|
||||
}()
|
||||
|
||||
if err = http.Serve(ln, ginServer.Handler()); nil != err {
|
||||
if err = http.Serve(ln, ginServer.Handler()); err != nil {
|
||||
if !fastMode {
|
||||
logging.LogErrorf("boot kernel failed: %s", err)
|
||||
os.Exit(logging.ExitCodeUnavailablePort)
|
||||
|
|
@ -152,20 +152,20 @@ func rewritePortJSON(pid, port string) {
|
|||
|
||||
if gulu.File.IsExist(portJSON) {
|
||||
data, err = os.ReadFile(portJSON)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogWarnf("read port.json failed: %s", err)
|
||||
} else {
|
||||
if err = gulu.JSON.UnmarshalJSON(data, &pidPorts); nil != err {
|
||||
if err = gulu.JSON.UnmarshalJSON(data, &pidPorts); err != nil {
|
||||
logging.LogWarnf("unmarshal port.json failed: %s", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pidPorts[pid] = port
|
||||
if data, err = gulu.JSON.MarshalIndentJSON(pidPorts, "", " "); nil != err {
|
||||
if data, err = gulu.JSON.MarshalIndentJSON(pidPorts, "", " "); err != nil {
|
||||
logging.LogWarnf("marshal port.json failed: %s", err)
|
||||
} else {
|
||||
if err = os.WriteFile(portJSON, data, 0644); nil != err {
|
||||
if err = os.WriteFile(portJSON, data, 0644); err != nil {
|
||||
logging.LogWarnf("write port.json failed: %s", err)
|
||||
}
|
||||
}
|
||||
|
|
@ -204,7 +204,7 @@ func serveSnippets(ginServer *gin.Engine) {
|
|||
ext := filepath.Ext(filePath)
|
||||
name := strings.TrimSuffix(filePath, ext)
|
||||
confSnippets, err := model.LoadSnippets()
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("load snippets failed: %s", err)
|
||||
c.Status(http.StatusNotFound)
|
||||
return
|
||||
|
|
@ -278,13 +278,13 @@ func serveAppearance(ginServer *gin.Engine) {
|
|||
|
||||
enUSFilePath := filepath.Join(appearancePath, "langs", "en_US.json")
|
||||
enUSData, err := os.ReadFile(enUSFilePath)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("read en_US.json [%s] failed: %s", enUSFilePath, err)
|
||||
util.ReportFileSysFatalError(err)
|
||||
return
|
||||
}
|
||||
enUSMap := map[string]interface{}{}
|
||||
if err = gulu.JSON.UnmarshalJSON(enUSData, &enUSMap); nil != err {
|
||||
if err = gulu.JSON.UnmarshalJSON(enUSData, &enUSMap); err != nil {
|
||||
logging.LogErrorf("unmarshal en_US.json [%s] failed: %s", enUSFilePath, err)
|
||||
util.ReportFileSysFatalError(err)
|
||||
return
|
||||
|
|
@ -292,13 +292,13 @@ func serveAppearance(ginServer *gin.Engine) {
|
|||
|
||||
for {
|
||||
data, err := os.ReadFile(filePath)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
c.JSON(200, enUSMap)
|
||||
return
|
||||
}
|
||||
|
||||
langMap := map[string]interface{}{}
|
||||
if err = gulu.JSON.UnmarshalJSON(data, &langMap); nil != err {
|
||||
if err = gulu.JSON.UnmarshalJSON(data, &langMap); err != nil {
|
||||
logging.LogErrorf("unmarshal json [%s] failed: %s", filePath, err)
|
||||
c.JSON(200, enUSMap)
|
||||
return
|
||||
|
|
@ -327,14 +327,14 @@ func serveCheckAuth(ginServer *gin.Engine) {
|
|||
|
||||
func serveAuthPage(c *gin.Context) {
|
||||
data, err := os.ReadFile(filepath.Join(util.WorkingDir, "stage/auth.html"))
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("load auth page failed: %s", err)
|
||||
c.Status(500)
|
||||
return
|
||||
}
|
||||
|
||||
tpl, err := template.New("auth").Parse(string(data))
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
logging.LogErrorf("parse auth page failed: %s", err)
|
||||
c.Status(500)
|
||||
return
|
||||
|
|
@ -378,7 +378,7 @@ func serveAuthPage(c *gin.Context) {
|
|||
"workspaceDir": util.WorkspaceDir,
|
||||
}
|
||||
buf := &bytes.Buffer{}
|
||||
if err = tpl.Execute(buf, model); nil != err {
|
||||
if err = tpl.Execute(buf, model); err != nil {
|
||||
logging.LogErrorf("execute auth page failed: %s", err)
|
||||
c.Status(500)
|
||||
return
|
||||
|
|
@ -394,7 +394,7 @@ func serveAssets(ginServer *gin.Engine) {
|
|||
requestPath := context.Param("path")
|
||||
relativePath := path.Join("assets", requestPath)
|
||||
p, err := model.GetAssetAbsPath(relativePath)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
if strings.Contains(strings.TrimPrefix(requestPath, "/"), "/") {
|
||||
// 再使用编码过的路径解析一次 https://github.com/siyuan-note/siyuan/issues/11823
|
||||
dest := url.PathEscape(strings.TrimPrefix(requestPath, "/"))
|
||||
|
|
@ -403,7 +403,7 @@ func serveAssets(ginServer *gin.Engine) {
|
|||
p, err = model.GetAssetAbsPath(relativePath)
|
||||
}
|
||||
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
context.Status(http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
|
|
@ -450,7 +450,7 @@ func serveWebSocket(ginServer *gin.Engine) {
|
|||
util.WebSocketServer.Config.MaxMessageSize = 1024 * 1024 * 8
|
||||
|
||||
ginServer.GET("/ws", func(c *gin.Context) {
|
||||
if err := util.WebSocketServer.HandleRequest(c.Writer, c.Request); nil != err {
|
||||
if err := util.WebSocketServer.HandleRequest(c.Writer, c.Request); err != nil {
|
||||
logging.LogErrorf("handle command failed: %s", err)
|
||||
}
|
||||
})
|
||||
|
|
@ -465,7 +465,7 @@ func serveWebSocket(ginServer *gin.Engine) {
|
|||
|
||||
if "" != model.Conf.AccessAuthCode {
|
||||
session, err := cookieStore.Get(s.Request, "siyuan")
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
authOk = false
|
||||
logging.LogErrorf("get cookie failed: %s", err)
|
||||
} else {
|
||||
|
|
@ -475,7 +475,7 @@ func serveWebSocket(ginServer *gin.Engine) {
|
|||
} else {
|
||||
sess := &util.SessionData{}
|
||||
err = gulu.JSON.UnmarshalJSON([]byte(val.(string)), sess)
|
||||
if nil != err {
|
||||
if err != nil {
|
||||
authOk = false
|
||||
logging.LogErrorf("unmarshal cookie failed: %s", err)
|
||||
} else {
|
||||
|
|
@ -534,7 +534,7 @@ func serveWebSocket(ginServer *gin.Engine) {
|
|||
start := time.Now()
|
||||
logging.LogTracef("request [%s]", shortReqMsg(msg))
|
||||
request := map[string]interface{}{}
|
||||
if err := gulu.JSON.UnmarshalJSON(msg, &request); nil != err {
|
||||
if err := gulu.JSON.UnmarshalJSON(msg, &request); err != nil {
|
||||
result := util.NewResult()
|
||||
result.Code = -1
|
||||
result.Msg = "Bad Request"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue