feat ✨ 优化logger使用

This commit is contained in:
linwenxiang committed 2021-05-19 19:31:04 +08:00
1 parent d3fa3ecf6c
commit e23a1f615f
7 files changed
+21 -22

No files matched your search

+2 -2
View File
@@ -3,8 +3,8 @@ package service
import ( import (
"errors" "errors"
"github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"gorm.io/gorm" "gorm.io/gorm"
"go-admin/app/admin/models" "go-admin/app/admin/models"
@@ -24,7 +24,7 @@ func (e *SysMenu) MakeOrm(orm *gorm.DB) *SysMenu {
} }
// MakeLog 设置Log // MakeLog 设置Log
func (e *SysMenu) MakeLog(l *logger.Logger) *SysMenu { func (e *SysMenu) MakeLog(l *logger.Helper) *SysMenu {
e.Log = l e.Log = l
return e return e
} }
+6 -5
View File
@@ -3,21 +3,22 @@ package apis
import ( import (
"errors" "errors"
"fmt" "fmt"
"github.com/gin-gonic/gin/binding"
"go-admin/common/service"
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/api"
"github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"gorm.io/gorm" "gorm.io/gorm"
"go-admin/common/service"
) )
type Api struct { type Api struct {
Context *gin.Context Context *gin.Context
Logger *logger.Logger Logger *logger.Helper
Orm *gorm.DB Orm *gorm.DB
Errors error Errors error
} }
@@ -41,7 +42,7 @@ func (e *Api) MakeContext(c *gin.Context) *Api {
} }
// GetLogger 获取上下文提供的日志 // GetLogger 获取上下文提供的日志
func (e Api) GetLogger() *logger.Logger { func (e Api) GetLogger() *logger.Helper {
return api.GetRequestLogger(e.Context) return api.GetRequestLogger(e.Context)
} }
-10
View File
@@ -1,10 +0,0 @@
package apis
// GetRequestLogger 获取上下文提供的日志
//func GetRequestLogger(c *gin.Context) *logger.Logger {
// requestId := pkg.GenerateMsgIDFromContext(c)
// log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{
// strings.ToLower(pkg.TrafficKey): requestId,
// })
// return &logger.Logger{Logger: log}
//}
+1 -1
View File
@@ -76,7 +76,7 @@ func LoggerToFile() gin.HandlerFunc {
"method": reqMethod, "method": reqMethod,
"uri": reqUri, "uri": reqUri,
} }
log.Info(logData) log.WithFields(logData).Info()
//l := logger.Logger{Logger: log.Fields(logData)} //l := logger.Logger{Logger: log.Fields(logData)}
//l.Info(logData) //l.Info(logData)
if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB { if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB {
+7
View File
@@ -1,6 +1,8 @@
package middleware package middleware
import ( import (
"github.com/go-admin-team/go-admin-core/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"net/http" "net/http"
"strings" "strings"
@@ -24,6 +26,11 @@ func RequestId(trafficKey string) gin.HandlerFunc {
} }
c.Request.Header.Set(trafficKey, requestId) c.Request.Header.Set(trafficKey, requestId)
c.Set(trafficKey, requestId) c.Set(trafficKey, requestId)
c.Set(pkg.LoggerKey,
logger.NewHelper(logger.DefaultLogger).
WithFields(map[string]interface{}{
trafficKey: requestId,
}))
c.Next() c.Next()
} }
} }
+3 -2
View File
@@ -2,7 +2,8 @@ package service
import ( import (
"fmt" "fmt"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"github.com/go-admin-team/go-admin-core/logger"
"gorm.io/gorm" "gorm.io/gorm"
) )
@@ -10,7 +11,7 @@ type Service struct {
Orm *gorm.DB Orm *gorm.DB
Msg string Msg string
MsgID string MsgID string
Log *logger.Logger Log *logger.Helper
Error error Error error
} }
+2 -2
View File
@@ -9,8 +9,8 @@ require (
github.com/bytedance/go-tagexpr/v2 v2.7.10 github.com/bytedance/go-tagexpr/v2 v2.7.10
github.com/casbin/casbin/v2 v2.25.1 github.com/casbin/casbin/v2 v2.25.1
github.com/gin-gonic/gin v1.7.1 github.com/gin-gonic/gin v1.7.1
github.com/go-admin-team/go-admin-core v1.3.5-rc.0.0.20210423072631-e3580b68ee26 github.com/go-admin-team/go-admin-core v1.3.5-rc.0
github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210427015751-b42693c49c6c github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210519112810-242d8766f4b9
github.com/google/uuid v1.2.0 github.com/google/uuid v1.2.0
github.com/mssola/user_agent v0.5.2 github.com/mssola/user_agent v0.5.2
github.com/opentracing/opentracing-go v1.1.0 github.com/opentracing/opentracing-go v1.1.0