bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-06 13:42:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

add ConnectTimeout configuration for gredis

Browse Source
This commit is contained in:
John
2019-10-29 09:49:29 +08:00
parent a0722ed51f
commit f9569b387f
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
database/gredis/gredis.go
View File

@ -44,6 +44,7 @@ type Config struct {
MaxActive int // Maximum number of connections limit (default is 0 means no limit)
IdleTimeout time.Duration // Maximum idle time for connection (default is 60 seconds, not allowed to be set to 0)
MaxConnLifetime time.Duration // Maximum lifetime of the connection (default is 60 seconds, not allowed to be set to 0)
ConnectTimeout time.Duration // Dial connection timeout.
}
// Pool statistics.
@ -53,6 +54,7 @@ type PoolStats struct {
const (
gDEFAULT_POOL_IDLE_TIMEOUT = 60 * time.Second
gDEFAULT_POOL_CONN_TIMEOUT = 10 * time.Second
gDEFAULT_POOL_MAX_LIFE_TIME = 60 * time.Second
)
@ -67,6 +69,9 @@ func New(config Config) *Redis {
if config.IdleTimeout == 0 {
config.IdleTimeout = gDEFAULT_POOL_IDLE_TIMEOUT
}
if config.ConnectTimeout == 0 {
config.ConnectTimeout = gDEFAULT_POOL_CONN_TIMEOUT
}
if config.MaxConnLifetime == 0 {
config.MaxConnLifetime = gDEFAULT_POOL_MAX_LIFE_TIME
}
@ -79,7 +84,11 @@ func New(config Config) *Redis {
MaxIdle: config.MaxIdle,
MaxConnLifetime: config.MaxConnLifetime,
Dial: func() (redis.Conn, error) {
c, err := redis.Dial("tcp", fmt.Sprintf("%s:%d", config.Host, config.Port))
c, err := redis.Dial(
"tcp",
fmt.Sprintf("%s:%d", config.Host, config.Port),
redis.DialConnectTimeout(config.ConnectTimeout),
)
if err != nil {
return nil, err
}

9
database/gredis/gredis_unit_test.go
View File

@ -134,12 +134,13 @@ func Test_Instance(t *testing.T) {
})
}
func Test_Basic(t *testing.T) {
func Test_Error(t *testing.T) {
gtest.Case(t, func() {
config1 := gredis.Config{
Host: "127.0.0.2",
Port: 6379,
Db: 1,
Host: "127.0.0.2",
Port: 6379,
Db: 1,
ConnectTimeout: time.Second,
}
redis := gredis.New(config1)
_, err := redis.Do("info")