Merge remote-tracking branch 'origin/master'

pkg/config/redis.go

@@ -6,42 +6,48 @@ type RedisDatabase struct {
 	Database             string
 	MaxIdle              int
 	MaxActive            int
+	IdleTimeout          int
 	MaxAIdleTimeoutctive string
 	Prefix               string
 }
 
-//多数据库配置
+// 多数据库配置
 func BuildRedisConfigs() (RedisDatabaseMap map[string]RedisDatabase) {
-	redisReadMaxIdle,_ := Get("default_redis_read.max_idle").Int()
-	redisReadMaxActive,_ := Get("default_redis_read.max_active").Int()
-	redisWriteMaxIdle,_ := Get("default_redis_write.max_idle").Int()
-	redisWriteMaxActive,_ := Get("default_redis_write.max_active").Int()
-	redisSpuMaxIdle,_ := Get("default_redis_spu.max_idle").Int()
-	redisSpuMaxActive,_ := Get("default_redis_spu.max_active").Int()
+	redisReadMaxIdle, _ := Get("default_redis_read.max_idle").Int()
+	redisReadMaxActive, _ := Get("default_redis_read.max_active").Int()
+	redisWriteMaxIdle, _ := Get("default_redis_write.max_idle").Int()
+	redisWriteMaxActive, _ := Get("default_redis_write.max_active").Int()
+	redisSpuMaxIdle, _ := Get("default_redis_spu.max_idle").Int()
+	redisSpuMaxActive, _ := Get("default_redis_spu.max_active").Int()
+	redisIdleTimeout, _ := Get("default_redis_read.idle_timeout").Int()
 	return map[string]RedisDatabase{
 		"search_r": {
 			Host:        Get("default_redis_read.host").String(),
 			Password:    Get("default_redis_read.password").String(),
 			MaxIdle:     redisReadMaxIdle,
 			MaxActive:   redisReadMaxActive,
+			IdleTimeout: redisIdleTimeout,
 		},
 		"default_r": {
 			Host:        Get("default_redis_read.host").String(),
 			Password:    Get("default_redis_read.password").String(),
 			MaxIdle:     redisReadMaxIdle,
 			MaxActive:   redisReadMaxActive,
+			IdleTimeout: redisIdleTimeout,
 		},
 		"search_w": {
 			Host:        Get("default_redis_write.host").String(),
 			Password:    Get("default_redis_write.password").String(),
 			MaxIdle:     redisWriteMaxIdle,
 			MaxActive:   redisWriteMaxActive,
+			IdleTimeout: redisIdleTimeout,
 		},
 		"spu": {
 			Host:        Get("default_redis_spu.host").String(),
 			Password:    Get("default_redis_spu.password").String(),
 			MaxIdle:     redisSpuMaxIdle,
 			MaxActive:   redisSpuMaxActive,
+			IdleTimeout: redisIdleTimeout,
 		},
 	}
 }

pkg/gredis/redis.go

@@ -44,11 +44,13 @@ func getConn(writeHost, password string, maxIdle, maxActive int) (pool *redis.Po
 	pool = &redis.Pool{
 		MaxIdle:     maxIdle,
 		MaxActive:   maxActive,
+		IdleTimeout: 240 * time.Second,
 		Dial: func() (redis.Conn, error) {
 			c, err := redis.Dial("tcp", writeHost,
 				redis.DialConnectTimeout(2*time.Second),
 				redis.DialReadTimeout(2*time.Second),
-				redis.DialWriteTimeout(2*time.Second))
+				redis.DialWriteTimeout(2*time.Second),
+			)
 			if err != nil {
 				return nil, err
 			}