From 64404d1295102148bbab9a3422d3eae53b0c23ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Tue, 6 Sep 2022 14:13:48 +0800 Subject: [PATCH] - update config --- const.go | 2 +- gorm.go | 24 +++++++--------- gorm_mysql.go | 34 +++++++++++------------ gorm_postgresql.go | 68 +++++++++++++++++++++++----------------------- 4 files changed, 62 insertions(+), 66 deletions(-) diff --git a/const.go b/const.go index 55fcc24..1f9d9ef 100644 --- a/const.go +++ b/const.go @@ -1,3 +1,3 @@ package dorm -const Version = "1.0.31" +const Version = "1.0.32" diff --git a/gorm.go b/gorm.go index afa8982..5a13897 100644 --- a/gorm.go +++ b/gorm.go @@ -10,20 +10,16 @@ import ( ) type ConfigGormClient struct { - Dns string // 地址 - Log struct { - Status bool // 状态 - Path string // 路径 - Slow int64 // 慢SQL阈值 - Level string // 级别 - NotFoundError bool // 忽略ErrRecordNotFound（记录未找到）错误 - Colorful bool // 禁用彩色打印 - } // 日志 - Conn struct { - SetMaxIdle int // 设置空闲连接池中连接的最大数量 - SetMaxOpen int // 设置打开数据库连接的最大数量 - SetConnMaxLifetime int64 // 设置了连接可复用的最大时间 - } // 连接 + Dns string // 地址 + LogStatus bool // 日志 - 状态 + LogPath string // 日志 - 路径 + LogSlow int64 // 日志 - 慢SQL阈值 + LogLevel string // 日志 - 级别 + LogNotFoundError bool // 日志 - 忽略ErrRecordNotFound（记录未找到）错误 + LogColorful bool // 日志 - 禁用彩色打印 + ConnSetMaxIdle int // 连接 - 设置空闲连接池中连接的最大数量 + ConnSetMaxOpen int // 连接 - 设置打开数据库连接的最大数量 + ConnSetConnMaxLifetime int64 // 连接 - 设置了连接可复用的最大时间 } // GormClient diff --git a/gorm_mysql.go b/gorm_mysql.go index 079706e..f795c97 100644 --- a/gorm_mysql.go +++ b/gorm_mysql.go @@ -16,23 +16,23 @@ func NewGormMysqlClient(config *ConfigGormClient) (*GormClient, error) { c := &GormClient{config: config} // 判断路径 - if c.config.Log.Path == "" { + if c.config.LogPath == "" { logsUrl = "/logs/mysql" } else { - logsUrl = c.config.Log.Path + logsUrl = c.config.LogPath } - if c.config.Log.Status == true { + if c.config.LogStatus { var slowThreshold time.Duration var logLevel logger.LogLevel - if c.config.Log.Slow == 0 { + if c.config.LogSlow == 0 { slowThreshold = 100 * time.Millisecond } else { - slowThreshold = time.Duration(c.config.Log.Slow) + slowThreshold = time.Duration(c.config.LogSlow) } - if c.config.Log.Level == "Error" { + if c.config.LogLevel == "Error" { logLevel = logger.Error - } else if c.config.Log.Level == "Warn" { + } else if c.config.LogLevel == "Warn" { logLevel = logger.Warn } else { logLevel = logger.Info @@ -41,10 +41,10 @@ func NewGormMysqlClient(config *ConfigGormClient) (*GormClient, error) { Logger: logger.New( writer{}, logger.Config{ - SlowThreshold: slowThreshold, // 慢SQL阈值 - LogLevel: logLevel, // 日志级别 - IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 - Colorful: c.config.Log.Colorful, // 禁用彩色打印 + SlowThreshold: slowThreshold, // 慢SQL阈值 + LogLevel: logLevel, // 日志级别 + IgnoreRecordNotFoundError: c.config.LogNotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 + Colorful: c.config.LogColorful, // 禁用彩色打印 }, ), NowFunc: func() time.Time { @@ -65,24 +65,24 @@ func NewGormMysqlClient(config *ConfigGormClient) (*GormClient, error) { } // 设置空闲连接池中连接的最大数量 - if c.config.Conn.SetMaxIdle == 0 { + if c.config.ConnSetMaxIdle == 0 { sqlDB.SetMaxIdleConns(10) } else { - sqlDB.SetMaxIdleConns(c.config.Conn.SetMaxIdle) + sqlDB.SetMaxIdleConns(c.config.ConnSetMaxIdle) } // 设置打开数据库连接的最大数量 - if c.config.Conn.SetMaxOpen == 0 { + if c.config.ConnSetMaxOpen == 0 { sqlDB.SetMaxOpenConns(100) } else { - sqlDB.SetMaxOpenConns(c.config.Conn.SetMaxOpen) + sqlDB.SetMaxOpenConns(c.config.ConnSetMaxOpen) } // 设置了连接可复用的最大时间 - if c.config.Conn.SetConnMaxLifetime == 0 { + if c.config.ConnSetConnMaxLifetime == 0 { sqlDB.SetConnMaxLifetime(time.Second * 600) } else { - sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) + sqlDB.SetConnMaxLifetime(time.Duration(c.config.ConnSetConnMaxLifetime)) } return c, nil diff --git a/gorm_postgresql.go b/gorm_postgresql.go index 7bbbc55..19b74a5 100644 --- a/gorm_postgresql.go +++ b/gorm_postgresql.go @@ -17,23 +17,23 @@ func NewGormPostgresClient(config *ConfigGormClient) (*GormClient, error) { c.config = config // 判断路径 - if c.config.Log.Path == "" { + if c.config.LogPath == "" { logsUrl = "/logs/postgresql" } else { - logsUrl = c.config.Log.Path + logsUrl = c.config.LogPath } - if c.config.Log.Status == true { + if c.config.LogStatus { var slowThreshold time.Duration var logLevel logger.LogLevel - if c.config.Log.Slow == 0 { + if c.config.LogSlow == 0 { slowThreshold = 100 * time.Millisecond } else { - slowThreshold = time.Duration(c.config.Log.Slow) + slowThreshold = time.Duration(c.config.LogSlow) } - if c.config.Log.Level == "Error" { + if c.config.LogLevel == "Error" { logLevel = logger.Error - } else if c.config.Log.Level == "Warn" { + } else if c.config.LogLevel == "Warn" { logLevel = logger.Warn } else { logLevel = logger.Info @@ -42,10 +42,10 @@ func NewGormPostgresClient(config *ConfigGormClient) (*GormClient, error) { Logger: logger.New( writer{}, logger.Config{ - SlowThreshold: slowThreshold, // 慢SQL阈值 - LogLevel: logLevel, // 日志级别 - IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 - Colorful: c.config.Log.Colorful, // 禁用彩色打印 + SlowThreshold: slowThreshold, // 慢SQL阈值 + LogLevel: logLevel, // 日志级别 + IgnoreRecordNotFoundError: c.config.LogNotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 + Colorful: c.config.LogColorful, // 禁用彩色打印 }, ), NowFunc: func() time.Time { @@ -66,24 +66,24 @@ func NewGormPostgresClient(config *ConfigGormClient) (*GormClient, error) { } // 设置空闲连接池中连接的最大数量 - if c.config.Conn.SetMaxIdle == 0 { + if c.config.ConnSetMaxIdle == 0 { sqlDB.SetMaxIdleConns(10) } else { - sqlDB.SetMaxIdleConns(c.config.Conn.SetMaxIdle) + sqlDB.SetMaxIdleConns(c.config.ConnSetMaxIdle) } // 设置打开数据库连接的最大数量 - if c.config.Conn.SetMaxOpen == 0 { + if c.config.ConnSetMaxOpen == 0 { sqlDB.SetMaxOpenConns(100) } else { - sqlDB.SetMaxOpenConns(c.config.Conn.SetMaxOpen) + sqlDB.SetMaxOpenConns(c.config.ConnSetMaxOpen) } // 设置了连接可复用的最大时间 - if c.config.Conn.SetConnMaxLifetime == 0 { + if c.config.ConnSetConnMaxLifetime == 0 { sqlDB.SetConnMaxLifetime(time.Second * 600) } else { - sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) + sqlDB.SetConnMaxLifetime(time.Duration(c.config.ConnSetConnMaxLifetime)) } return c, nil @@ -96,23 +96,23 @@ func NewGormPostgresqlClient(config *ConfigGormClient) (*GormClient, error) { c.config = config // 判断路径 - if c.config.Log.Path == "" { + if c.config.LogPath == "" { logsUrl = "/logs/postgresql" } else { - logsUrl = c.config.Log.Path + logsUrl = c.config.LogPath } - if c.config.Log.Status == true { + if c.config.LogStatus { var slowThreshold time.Duration var logLevel logger.LogLevel - if c.config.Log.Slow == 0 { + if c.config.LogSlow == 0 { slowThreshold = 100 * time.Millisecond } else { - slowThreshold = time.Duration(c.config.Log.Slow) + slowThreshold = time.Duration(c.config.LogSlow) } - if c.config.Log.Level == "Error" { + if c.config.LogLevel == "Error" { logLevel = logger.Error - } else if c.config.Log.Level == "Warn" { + } else if c.config.LogLevel == "Warn" { logLevel = logger.Warn } else { logLevel = logger.Info @@ -121,10 +121,10 @@ func NewGormPostgresqlClient(config *ConfigGormClient) (*GormClient, error) { Logger: logger.New( writer{}, logger.Config{ - SlowThreshold: slowThreshold, // 慢SQL阈值 - LogLevel: logLevel, // 日志级别 - IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 - Colorful: c.config.Log.Colorful, // 禁用彩色打印 + SlowThreshold: slowThreshold, // 慢SQL阈值 + LogLevel: logLevel, // 日志级别 + IgnoreRecordNotFoundError: c.config.LogNotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 + Colorful: c.config.LogColorful, // 禁用彩色打印 }, ), NowFunc: func() time.Time { @@ -145,24 +145,24 @@ func NewGormPostgresqlClient(config *ConfigGormClient) (*GormClient, error) { } // 设置空闲连接池中连接的最大数量 - if c.config.Conn.SetMaxIdle == 0 { + if c.config.ConnSetMaxIdle == 0 { sqlDB.SetMaxIdleConns(10) } else { - sqlDB.SetMaxIdleConns(c.config.Conn.SetMaxIdle) + sqlDB.SetMaxIdleConns(c.config.ConnSetMaxIdle) } // 设置打开数据库连接的最大数量 - if c.config.Conn.SetMaxOpen == 0 { + if c.config.ConnSetMaxOpen == 0 { sqlDB.SetMaxOpenConns(100) } else { - sqlDB.SetMaxOpenConns(c.config.Conn.SetMaxOpen) + sqlDB.SetMaxOpenConns(c.config.ConnSetMaxOpen) } // 设置了连接可复用的最大时间 - if c.config.Conn.SetConnMaxLifetime == 0 { + if c.config.ConnSetConnMaxLifetime == 0 { sqlDB.SetConnMaxLifetime(time.Second * 600) } else { - sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) + sqlDB.SetConnMaxLifetime(time.Duration(c.config.ConnSetConnMaxLifetime)) } return c, nil