整合gorm的log
This commit is contained in:
1 parent
72a95babe5
commit
4741137c9a
3 files changed
+26
-6
No files matched your search
@@ -3,7 +3,6 @@ package database
|
|||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gorm.io/driver/mysql"
|
"gorm.io/driver/mysql"
|
||||||
@@ -13,6 +12,7 @@ import (
|
|||||||
|
|
||||||
"go-admin/common/config"
|
"go-admin/common/config"
|
||||||
"go-admin/common/global"
|
"go-admin/common/global"
|
||||||
|
goAdminLogger "go-admin/logger"
|
||||||
"go-admin/tools"
|
"go-admin/tools"
|
||||||
toolsConfig "go-admin/tools/config"
|
toolsConfig "go-admin/tools/config"
|
||||||
)
|
)
|
||||||
@@ -47,10 +47,13 @@ func (e *Mysql) Setup() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if toolsConfig.LoggerConfig.EnabledDB {
|
if toolsConfig.LoggerConfig.EnabledDB {
|
||||||
global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
|
global.Eloquent.Logger = logger.New(
|
||||||
|
log.New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", log.LstdFlags),
|
||||||
|
logger.Config{
|
||||||
SlowThreshold: time.Second,
|
SlowThreshold: time.Second,
|
||||||
Colorful: true,
|
Colorful: true,
|
||||||
LogLevel: logger.Info,
|
LogLevel: logger.LogLevel(
|
||||||
|
goAdminLogger.DefaultLogger.Options().Level.LevelForGorm()),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package database
|
|||||||
import (
|
import (
|
||||||
"database/sql"
|
"database/sql"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"gorm.io/driver/postgres"
|
"gorm.io/driver/postgres"
|
||||||
@@ -13,6 +12,7 @@ import (
|
|||||||
|
|
||||||
"go-admin/common/config"
|
"go-admin/common/config"
|
||||||
"go-admin/common/global"
|
"go-admin/common/global"
|
||||||
|
goAdminLogger "go-admin/logger"
|
||||||
"go-admin/tools"
|
"go-admin/tools"
|
||||||
toolsConfig "go-admin/tools/config"
|
toolsConfig "go-admin/tools/config"
|
||||||
)
|
)
|
||||||
@@ -49,10 +49,13 @@ func (e *PgSql) Setup() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if toolsConfig.LoggerConfig.EnabledDB {
|
if toolsConfig.LoggerConfig.EnabledDB {
|
||||||
global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
|
global.Eloquent.Logger = logger.New(
|
||||||
|
log.New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", log.LstdFlags),
|
||||||
|
logger.Config{
|
||||||
SlowThreshold: time.Second,
|
SlowThreshold: time.Second,
|
||||||
Colorful: true,
|
Colorful: true,
|
||||||
LogLevel: logger.Info,
|
LogLevel: logger.LogLevel(
|
||||||
|
goAdminLogger.DefaultLogger.Options().Level.LevelForGorm()),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,6 +41,20 @@ func (l Level) String() string {
|
|||||||
return ""
|
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.
|
// Enabled returns true if the given level is at or above this level.
|
||||||
func (l Level) Enabled(lvl Level) bool {
|
func (l Level) Enabled(lvl Level) bool {
|
||||||
return lvl >= l
|
return lvl >= l
|
||||||
|
|||||||
Reference in new issue
Block a user