feat : update log import

This commit is contained in:
zhangwenjian committed 2020-07-27 22:33:00 +08:00
1 parent caab6097b8
commit 2b92b100e3
3 files changed
+9 -10

No files matched your search

+6 -7
View File
@@ -3,8 +3,8 @@ package database
import ( import (
_ "github.com/go-sql-driver/mysql" //加载mysql _ "github.com/go-sql-driver/mysql" //加载mysql
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
log "github.com/sirupsen/logrus"
"go-admin/global" "go-admin/global"
"go-admin/tools"
"go-admin/tools/config" "go-admin/tools/config"
) )
@@ -17,20 +17,19 @@ func (e *Mysql) Setup() {
db = new(Mysql) db = new(Mysql)
global.Source = db.GetConnect() global.Source = db.GetConnect()
log.Info(global.Source) global.Logger.Info(tools.Green(global.Source))
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect()) global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
if err != nil { if err != nil {
log.Fatalf("%s connect error %v", db.GetDriver(), err) global.Logger.Error(tools.Red(db.GetDriver()+" connect error :"), err)
} else { } else {
log.Printf("%s connect success!", db.GetDriver()) global.Logger.Info(tools.Green(db.GetDriver() + " connect success !"))
} }
if global.Eloquent.Error != nil { if global.Eloquent.Error != nil {
log.Fatalf("database error %v", global.Eloquent.Error) global.Logger.Error(tools.Red(" database error :"), global.Eloquent.Error)
} }
global.Eloquent.LogMode(config.DatabaseConfig.Logger.Enabled) global.Eloquent.LogMode(config.LoggerConfig.EnabledDB)
//global.Eloquent.SetLogger(global.DBLogger)
} }
// 打开数据库连接 // 打开数据库连接
+2 -2
View File
@@ -3,9 +3,9 @@ package database
import ( import (
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/postgres" _ "github.com/jinzhu/gorm/dialects/postgres"
log "github.com/sirupsen/logrus"
"go-admin/global" "go-admin/global"
"go-admin/tools/config" "go-admin/tools/config"
"log"
) )
type PgSql struct { type PgSql struct {
@@ -17,7 +17,7 @@ func (e *PgSql) Setup() {
db = new(PgSql) db = new(PgSql)
global.Source = db.GetConnect() global.Source = db.GetConnect()
log.Info(global.Source) log.Println(global.Source)
global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect()) global.Eloquent, err = db.Open(db.GetDriver(), db.GetConnect())
if err != nil { if err != nil {
log.Fatalf("%s connect error %v", db.GetDriver(), err) log.Fatalf("%s connect error %v", db.GetDriver(), err)
+1 -1
View File
@@ -5,7 +5,7 @@ package database
import ( import (
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
_ "github.com/jinzhu/gorm/dialects/sqlite" _ "github.com/jinzhu/gorm/dialects/sqlite"
log "github.com/sirupsen/logrus" "log"
"go-admin/global" "go-admin/global"
"go-admin/tools/config" "go-admin/tools/config"
) )