|
|
|
@ -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
|
|
|
|
|