logger模块移入go-admin-core仓库,修改log用法暂时折中

fixme:后期要尽快改成统一的log处理方式
This commit is contained in:
linwenxiang committed 2020-10-26 22:37:44 +08:00
1 parent a68e58f93b
commit da4637d285
27 files changed
+119 -784

No files matched your search

+9 -8
View File
@@ -2,7 +2,7 @@ package database
import (
"database/sql"
"log"
. "log"
"time"
"gorm.io/driver/mysql"
@@ -10,9 +10,10 @@ import (
"gorm.io/gorm/logger"
"gorm.io/gorm/schema"
goAdminLogger "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/config"
"go-admin/common/global"
goAdminLogger "go-admin/logger"
"go-admin/common/log"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
)
@@ -22,10 +23,10 @@ type Mysql struct {
func (e *Mysql) Setup() {
global.Source = e.GetConnect()
global.Logger.Info(tools.Green(global.Source))
log.Info(tools.Green(global.Source))
db, err := sql.Open("mysql", global.Source)
if err != nil {
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
log.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
}
global.Cfg.SetDb(&config.DBConfig{
Driver: "mysql",
@@ -37,18 +38,18 @@ func (e *Mysql) Setup() {
},
})
if err != nil {
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
log.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
} else {
global.Logger.Info(tools.Green(e.GetDriver() + " connect success !"))
log.Info(tools.Green(e.GetDriver() + " connect success !"))
}
if global.Eloquent.Error != nil {
global.Logger.Fatal(tools.Red(" database error :"), global.Eloquent.Error)
log.Fatal(tools.Red(" database error :"), global.Eloquent.Error)
}
if toolsConfig.LoggerConfig.EnabledDB {
global.Eloquent.Logger = logger.New(
log.New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", log.LstdFlags),
New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", LstdFlags),
logger.Config{
SlowThreshold: time.Second,
Colorful: true,
+6 -5
View File
@@ -2,7 +2,8 @@ package database
import (
"database/sql"
"log"
"go-admin/common/log"
. "log"
"time"
"gorm.io/driver/postgres"
@@ -10,9 +11,9 @@ import (
"gorm.io/gorm/logger"
"gorm.io/gorm/schema"
goAdminLogger "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/config"
"go-admin/common/global"
goAdminLogger "go-admin/logger"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
)
@@ -24,7 +25,7 @@ func (e *PgSql) Setup() {
var err error
global.Source = e.GetConnect()
log.Println(global.Source)
log.Info(global.Source)
db, err := sql.Open("postgresql", global.Source)
if err != nil {
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
@@ -41,7 +42,7 @@ func (e *PgSql) Setup() {
if err != nil {
log.Fatalf("%s connect error %v", e.GetDriver(), err)
} else {
log.Printf("%s connect success!", e.GetDriver())
log.Infof("%s connect success!", e.GetDriver())
}
if global.Eloquent.Error != nil {
@@ -50,7 +51,7 @@ func (e *PgSql) Setup() {
if toolsConfig.LoggerConfig.EnabledDB {
global.Eloquent.Logger = logger.New(
log.New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", log.LstdFlags),
New(goAdminLogger.DefaultLogger.Options().Out, "\r\n", LstdFlags),
logger.Config{
SlowThreshold: time.Second,
Colorful: true,
+11 -8
View File
@@ -4,7 +4,7 @@ package database
import (
"database/sql"
"log"
. "log"
"os"
"time"
@@ -15,6 +15,7 @@ import (
"go-admin/common/config"
"go-admin/common/global"
"go-admin/common/log"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
)
@@ -26,7 +27,7 @@ func (e *SqLite) Setup() {
var err error
global.Source = e.GetConnect()
log.Println(global.Source)
log.Info(global.Source)
db, err := sql.Open("sqlite3", global.Source)
if err != nil {
global.Logger.Fatal(tools.Red(e.GetDriver()+" connect error :"), err)
@@ -44,7 +45,7 @@ func (e *SqLite) Setup() {
if err != nil {
log.Fatalf("%s connect error %v", e.GetDriver(), err)
} else {
log.Printf("%s connect success!", e.GetDriver())
log.Infof("%s connect success!", e.GetDriver())
}
if global.Eloquent.Error != nil {
@@ -52,11 +53,13 @@ func (e *SqLite) 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(
New(os.Stdout, "\r\n", LstdFlags), logger.Config{
SlowThreshold: time.Second,
Colorful: true,
LogLevel: logger.Info,
},
)
}
}