Merge pull request #253 from go-admin-team/dev

整合gorm的log
This commit is contained in:
wenjianzhang authored and GitHub committed 2020-10-12 10:57:36 +08:00
commit 2ecabd1202
3 files changed
+32 -12

No files matched your search

+9 -6
View File
@@ -3,7 +3,6 @@ package database
import (
"database/sql"
"log"
"os"
"time"
"gorm.io/driver/mysql"
@@ -13,6 +12,7 @@ import (
"go-admin/common/config"
"go-admin/common/global"
goAdminLogger "go-admin/logger"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
)
@@ -47,11 +47,14 @@ func (e *Mysql) Setup() {
}
if toolsConfig.LoggerConfig.EnabledDB {
global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
SlowThreshold: time.Second,
Colorful: true,
LogLevel: logger.Info,
})
global.Eloquent.Logger = logger.New(
log.New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", log.LstdFlags),
logger.Config{
SlowThreshold: time.Second,
Colorful: true,
LogLevel: logger.LogLevel(
goAdminLogger.DefaultLogger.Options().Level.LevelForGorm()),
})
}
}
+9 -6
View File
@@ -3,7 +3,6 @@ package database
import (
"database/sql"
"log"
"os"
"time"
"gorm.io/driver/postgres"
@@ -13,6 +12,7 @@ import (
"go-admin/common/config"
"go-admin/common/global"
goAdminLogger "go-admin/logger"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
)
@@ -49,11 +49,14 @@ func (e *PgSql) Setup() {
}
if toolsConfig.LoggerConfig.EnabledDB {
global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
SlowThreshold: time.Second,
Colorful: true,
LogLevel: logger.Info,
})
global.Eloquent.Logger = logger.New(
log.New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", log.LstdFlags),
logger.Config{
SlowThreshold: time.Second,
Colorful: true,
LogLevel: logger.LogLevel(
goAdminLogger.DefaultLogger.Options().Level.LevelForGorm()),
})
}
}
+14
View File
@@ -41,6 +41,20 @@ func (l Level) String() string {
return ""
}
// LevelForGorm 转换成gorm日志级别
func (l Level) LevelForGorm() int {
switch l {
case FatalLevel, ErrorLevel:
return 2
case WarnLevel:
return 3
case InfoLevel, DebugLevel, TraceLevel:
return 4
default:
return 1
}
}
// Enabled returns true if the given level is at or above this level.
func (l Level) Enabled(lvl Level) bool {
return lvl >= l