From 7920e7c5a055423038d67551b9d14dc8c250b26d Mon Sep 17 00:00:00 2001 From: yvling Date: Tue, 17 Dec 2024 17:03:16 +0800 Subject: [PATCH] fix: Corrected log format --- .gitignore | 1 + internal/mApp/mApp.go | 19 +++++++++++++------ internal/mApp/mHandler.go | 6 +++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 999562e..e044e82 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ # https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore # Work dir and files +*.log .idea tmp diff --git a/internal/mApp/mApp.go b/internal/mApp/mApp.go index 1f3f543..d6456e6 100644 --- a/internal/mApp/mApp.go +++ b/internal/mApp/mApp.go @@ -1,13 +1,12 @@ package mApp import ( + "MollyBlog/config" + "MollyBlog/internal/model" "fmt" "html/template" "log" - "MollyBlog/config" - "MollyBlog/internal/model" - "github.com/88250/lute" "github.com/gin-gonic/gin" "github.com/huichen/wukong/engine" @@ -40,11 +39,19 @@ const ( DST = "_post/dst" // destination html files ) +func init() { + log.SetPrefix("[MollyBlog] ") + log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile) + + gin.SetMode(gin.ReleaseMode) +} + func (ma *MApp) Run() { ma.loadRoutes() ma.loadTemplates() addr := fmt.Sprintf("%s:%d", ma.Host, ma.Port) + log.Printf("mApp listening on %s\n", addr) err := ma.engine.Run(addr) if err != nil { log.Fatal(err) @@ -52,8 +59,8 @@ func (ma *MApp) Run() { } func NewMApp(cfg *config.MConfig) *MApp { - engine := gin.Default() - engine.SetFuncMap(template.FuncMap{ + _engine := gin.Default() + _engine.SetFuncMap(template.FuncMap{ "add": func(a, b int) int { return a + b }, @@ -76,7 +83,7 @@ func NewMApp(cfg *config.MConfig) *MApp { CategorizedPosts: make(map[string][]*model.MPost), lute: lute.New(), - engine: engine, + engine: _engine, } } diff --git a/internal/mApp/mHandler.go b/internal/mApp/mHandler.go index 27d606a..ed594b6 100644 --- a/internal/mApp/mHandler.go +++ b/internal/mApp/mHandler.go @@ -3,9 +3,9 @@ package mApp import ( "encoding/json" "fmt" - "github.com/huichen/wukong/types" "html/template" "io" + "log" "net/http" "os" "strconv" @@ -15,6 +15,7 @@ import ( "MollyBlog/utils" "github.com/gin-gonic/gin" + "github.com/huichen/wukong/types" ) func (ma *MApp) IndexHandler(ctx *gin.Context) { @@ -407,12 +408,14 @@ func (ma *MApp) UpdateBlogHandler(ctx *gin.Context) { err = ma.loadMarkdownFiles() if err != nil { + log.Printf("load markdown files failed, err:%v\n", err) _ = ctx.Error(err) return } err = ma.parseMarkdowns() if err != nil { + log.Printf("parse markdown files failed, err:%v\n", err) _ = ctx.Error(err) return } @@ -420,5 +423,6 @@ func (ma *MApp) UpdateBlogHandler(ctx *gin.Context) { // parse post index ma.loadPostIndex() + log.Println("update blog success") ctx.JSON(http.StatusOK, gin.H{"msg": "ok"}) }