From 4741137c9a57a706e3221817f103e27b91e26b45 Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Fri, 9 Oct 2020 19:32:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88gorm=E7=9A=84log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/database/mysql_drive.go | 15 +++++++++------ common/database/pgsql_driver.go | 15 +++++++++------ logger/level.go | 14 ++++++++++++++ 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/common/database/mysql_drive.go b/common/database/mysql_drive.go index fa83e47..6ed0b29 100644 --- a/common/database/mysql_drive.go +++ b/common/database/mysql_drive.go @@ -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()), + }) } } diff --git a/common/database/pgsql_driver.go b/common/database/pgsql_driver.go index e3980e1..e6b0c0b 100644 --- a/common/database/pgsql_driver.go +++ b/common/database/pgsql_driver.go @@ -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()), + }) } } diff --git a/logger/level.go b/logger/level.go index 915f0d4..14bca25 100644 --- a/logger/level.go +++ b/logger/level.go @@ -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