zhangdeman/database
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复mysql日志问题

Browse Source
This commit is contained in:
白茶清欢 2022-07-15 00:42:17 +08:00
parent 5965faa37f
commit b387fa6b9a
1 changed files with 5 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
client.go
View File

@ -13,9 +13,6 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"sync" "sync"
"time"
"go.uber.org/zap/zapcore"
"git.zhangdeman.cn/zhangdeman/util" "git.zhangdeman.cn/zhangdeman/util"
@ -24,7 +21,6 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"git.zhangdeman.cn/zhangdeman/logger"
gormLogger "gorm.io/gorm/logger" gormLogger "gorm.io/gorm/logger"
"gorm.io/driver/mysql" "gorm.io/driver/mysql"
@ -54,7 +50,7 @@ type client struct {
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
// //
// Date : 19:19 2022/6/5 // Date : 19:19 2022/6/5
func (c *client) AddWithConfigFile(cfgFilePath string) error { func (c *client) AddWithConfigFile(cfgFilePath string, logInstance *zap.Logger) error {
var ( var (
err error err error
cfg *cfgFile cfg *cfgFile
@ -76,10 +72,10 @@ func (c *client) AddWithConfigFile(cfgFilePath string) error {
extraFieldList: nil, extraFieldList: nil,
cfg: Mysql{}, cfg: Mysql{},
} }
if dbClient.master, err = c.GetDatabaseClient(cfg.Config.Master, nil); nil != err { if dbClient.master, err = c.GetDatabaseClient(cfg.Config.Master, logInstance); nil != err {
return err return err
} }
if dbClient.slave, err = c.GetDatabaseClient(cfg.Config.Slave, nil); nil != err { if dbClient.slave, err = c.GetDatabaseClient(cfg.Config.Slave, logInstance); nil != err {
return err return err
} }
c.lock.Lock() c.lock.Lock()
@ -93,10 +89,10 @@ func (c *client) AddWithConfigFile(cfgFilePath string) error {
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>
// //
// Date : 19:19 2022/6/5 // Date : 19:19 2022/6/5
func (c *client) BatchAddWithConfigDir(cfgDir string) error { func (c *client) BatchAddWithConfigDir(cfgDir string, logInstance *zap.Logger) error {
filepathNames, _ := filepath.Glob(filepath.Join(cfgDir, "*")) filepathNames, _ := filepath.Glob(filepath.Join(cfgDir, "*"))
for i := range filepathNames { for i := range filepathNames {
if err := c.AddWithConfigFile(filepathNames[i]); nil != err { if err := c.AddWithConfigFile(filepathNames[i], logInstance); nil != err {
return err return err
} }
} }
@ -208,44 +204,6 @@ func (c *client) GetSlaveClient(ctx *gin.Context, dbFlag string) (*gorm.DB, erro
return session, nil return session, nil
} }
// getLogInstance 获取日志实例
//
// Author : go_developer@163.com<白茶清欢>
//
// Date : 20:23 2022/6/5
func (c *client) getLogInstance(logConf *logger.InputLogConfig) (*zap.Logger, error) {
if nil == logConf {
return nil, nil
}
logConfList := []logger.SetLoggerOptionFunc{
logger.WithCallerSkip(logConf.CallerSkip),
logger.WithCaller(),
logger.WithUseJsonFormat(logConf.UseJson),
logger.WithShortCaller(logConf.UseShortFile),
}
if logConf.Console {
logConfList = append(logConfList, logger.WithConsoleOutput())
}
var (
err error
loggerInstance *zap.Logger
splitConfig *logger.RotateLogConfig
)
if splitConfig, err = logger.NewRotateLogConfig(
logConf.Path,
logConf.Name,
logger.WithDivisionChar(logConf.DivisionChar),
logger.WithTimeIntervalType(logConf.TimeIntervalType),
logger.WithMaxAge(time.Duration(logConf.MaxAge)*time.Second)); nil != err {
return nil, err
}
if loggerInstance, err = logger.NewLogger(zapcore.Level(logConf.LogLevel), splitConfig, logConfList...); nil != err {
return nil, err
}
return loggerInstance, nil
}
// getGormClient 获取GORM client方法 // getGormClient 获取GORM client方法
// //
// Author : go_developer@163.com<白茶清欢> // Author : go_developer@163.com<白茶清欢>