dtapps
/
dorm
1
0
Fork 0
Code Issues Pull Requests Projects Releases 60 Wiki Activity

- update config

Browse Source
master v1.0.32
李光春 2 years ago
parent 3aa6b9c942
commit 64404d1295
4 changed files with 62 additions and 66 deletions
Show Stats Download Patch File Download Diff File

2
const.go
Unescape View File

@ -1,3 +1,3 @@
package dorm package dorm
const Version = "1.0.31" const Version = "1.0.32"

24
gorm.go
Unescape View File

@ -10,20 +10,16 @@ import (
) )
type ConfigGormClient struct { type ConfigGormClient struct {
Dns string // 地址 Dns string // 地址
Log struct { LogStatus bool // 日志 - 状态
Status bool // 状态 LogPath string // 日志 - 路径
Path string // 路径 LogSlow int64 // 日志 - 慢SQL阈值
Slow int64 // 慢SQL阈值 LogLevel string // 日志 - 级别
Level string // 级别 LogNotFoundError bool // 日志 - 忽略ErrRecordNotFound（记录未找到）错误
NotFoundError bool // 忽略ErrRecordNotFound（记录未找到）错误 LogColorful bool // 日志 - 禁用彩色打印
Colorful bool // 禁用彩色打印 ConnSetMaxIdle int // 连接 - 设置空闲连接池中连接的最大数量
} // 日志 ConnSetMaxOpen int // 连接 - 设置打开数据库连接的最大数量
Conn struct { ConnSetConnMaxLifetime int64 // 连接 - 设置了连接可复用的最大时间
SetMaxIdle int // 设置空闲连接池中连接的最大数量
SetMaxOpen int // 设置打开数据库连接的最大数量
SetConnMaxLifetime int64 // 设置了连接可复用的最大时间
} // 连接
} }
// GormClient // GormClient

34
gorm_mysql.go
Unescape View File

@ -16,23 +16,23 @@ func NewGormMysqlClient(config *ConfigGormClient) (*GormClient, error) {
c := &GormClient{config: config} c := &GormClient{config: config}
// 判断路径 // 判断路径
if c.config.Log.Path == "" { if c.config.LogPath == "" {
logsUrl = "/logs/mysql" logsUrl = "/logs/mysql"
} else { } 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 slowThreshold time.Duration
var logLevel logger.LogLevel var logLevel logger.LogLevel
if c.config.Log.Slow == 0 { if c.config.LogSlow == 0 {
slowThreshold = 100 * time.Millisecond slowThreshold = 100 * time.Millisecond
} else { } 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 logLevel = logger.Error
} else if c.config.Log.Level == "Warn" { } else if c.config.LogLevel == "Warn" {
logLevel = logger.Warn logLevel = logger.Warn
} else { } else {
logLevel = logger.Info logLevel = logger.Info
@ -41,10 +41,10 @@ func NewGormMysqlClient(config *ConfigGormClient) (*GormClient, error) {
Logger: logger.New( Logger: logger.New(
writer{}, writer{},
logger.Config{ logger.Config{
SlowThreshold: slowThreshold, // 慢SQL阈值 SlowThreshold: slowThreshold, // 慢SQL阈值
LogLevel: logLevel, // 日志级别 LogLevel: logLevel, // 日志级别
IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 IgnoreRecordNotFoundError: c.config.LogNotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误
Colorful: c.config.Log.Colorful, // 禁用彩色打印 Colorful: c.config.LogColorful, // 禁用彩色打印
}, },
), ),
NowFunc: func() time.Time { 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) sqlDB.SetMaxIdleConns(10)
} else { } 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) sqlDB.SetMaxOpenConns(100)
} else { } 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) sqlDB.SetConnMaxLifetime(time.Second * 600)
} else { } else {
sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) sqlDB.SetConnMaxLifetime(time.Duration(c.config.ConnSetConnMaxLifetime))
} }
return c, nil return c, nil

68
gorm_postgresql.go
Unescape View File

@ -17,23 +17,23 @@ func NewGormPostgresClient(config *ConfigGormClient) (*GormClient, error) {
c.config = config c.config = config
// 判断路径 // 判断路径
if c.config.Log.Path == "" { if c.config.LogPath == "" {
logsUrl = "/logs/postgresql" logsUrl = "/logs/postgresql"
} else { } 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 slowThreshold time.Duration
var logLevel logger.LogLevel var logLevel logger.LogLevel
if c.config.Log.Slow == 0 { if c.config.LogSlow == 0 {
slowThreshold = 100 * time.Millisecond slowThreshold = 100 * time.Millisecond
} else { } 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 logLevel = logger.Error
} else if c.config.Log.Level == "Warn" { } else if c.config.LogLevel == "Warn" {
logLevel = logger.Warn logLevel = logger.Warn
} else { } else {
logLevel = logger.Info logLevel = logger.Info
@ -42,10 +42,10 @@ func NewGormPostgresClient(config *ConfigGormClient) (*GormClient, error) {
Logger: logger.New( Logger: logger.New(
writer{}, writer{},
logger.Config{ logger.Config{
SlowThreshold: slowThreshold, // 慢SQL阈值 SlowThreshold: slowThreshold, // 慢SQL阈值
LogLevel: logLevel, // 日志级别 LogLevel: logLevel, // 日志级别
IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 IgnoreRecordNotFoundError: c.config.LogNotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误
Colorful: c.config.Log.Colorful, // 禁用彩色打印 Colorful: c.config.LogColorful, // 禁用彩色打印
}, },
), ),
NowFunc: func() time.Time { 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) sqlDB.SetMaxIdleConns(10)
} else { } 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) sqlDB.SetMaxOpenConns(100)
} else { } 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) sqlDB.SetConnMaxLifetime(time.Second * 600)
} else { } else {
sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) sqlDB.SetConnMaxLifetime(time.Duration(c.config.ConnSetConnMaxLifetime))
} }
return c, nil return c, nil
@ -96,23 +96,23 @@ func NewGormPostgresqlClient(config *ConfigGormClient) (*GormClient, error) {
c.config = config c.config = config
// 判断路径 // 判断路径
if c.config.Log.Path == "" { if c.config.LogPath == "" {
logsUrl = "/logs/postgresql" logsUrl = "/logs/postgresql"
} else { } 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 slowThreshold time.Duration
var logLevel logger.LogLevel var logLevel logger.LogLevel
if c.config.Log.Slow == 0 { if c.config.LogSlow == 0 {
slowThreshold = 100 * time.Millisecond slowThreshold = 100 * time.Millisecond
} else { } 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 logLevel = logger.Error
} else if c.config.Log.Level == "Warn" { } else if c.config.LogLevel == "Warn" {
logLevel = logger.Warn logLevel = logger.Warn
} else { } else {
logLevel = logger.Info logLevel = logger.Info
@ -121,10 +121,10 @@ func NewGormPostgresqlClient(config *ConfigGormClient) (*GormClient, error) {
Logger: logger.New( Logger: logger.New(
writer{}, writer{},
logger.Config{ logger.Config{
SlowThreshold: slowThreshold, // 慢SQL阈值 SlowThreshold: slowThreshold, // 慢SQL阈值
LogLevel: logLevel, // 日志级别 LogLevel: logLevel, // 日志级别
IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 IgnoreRecordNotFoundError: c.config.LogNotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误
Colorful: c.config.Log.Colorful, // 禁用彩色打印 Colorful: c.config.LogColorful, // 禁用彩色打印
}, },
), ),
NowFunc: func() time.Time { 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) sqlDB.SetMaxIdleConns(10)
} else { } 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) sqlDB.SetMaxOpenConns(100)
} else { } 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) sqlDB.SetConnMaxLifetime(time.Second * 600)
} else { } else {
sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) sqlDB.SetConnMaxLifetime(time.Duration(c.config.ConnSetConnMaxLifetime))
} }
return c, nil return c, nil

Write Preview
Loading…
Cancel
Save