Add support for specifying Redis Timeout (TykTechnologies#2166)

Added new variable `storage.timeout` Fix TykTechnologies#2165
matiasinsaurralde · Mar 13, 2019 · 023290a · 023290a
1 parent 2344343
commit 023290a
Show file tree

Hide file tree

Showing 20 changed files with 3,421 additions and 21 deletions.
diff --git a/cli/lint/schema.go b/cli/lint/schema.go
@@ -34,6 +34,9 @@ const confSchema = `{
 			"optimisation_max_idle": {
 				"type": "integer"
 			},
+			"timeout": {
+				"type": "integer"
+			},
 			"password": {
 				"type": "string"
 			},

diff --git a/config/config.go b/config/config.go
@@ -55,6 +55,7 @@ type StorageOptionsConf struct {
 	Database              int               `json:"database"`
 	MaxIdle               int               `json:"optimisation_max_idle"`
 	MaxActive             int               `json:"optimisation_max_active"`
+	Timeout               int               `json:"timeout"`
 	EnableCluster         bool              `json:"enable_cluster"`
 	UseSSL                bool              `json:"use_ssl"`
 	SSLInsecureSkipVerify bool              `json:"ssl_insecure_skip_verify"`

diff --git a/storage/redis_cluster.go b/storage/redis_cluster.go
@@ -117,15 +117,24 @@ func NewRedisClusterPool(isCache bool) *rediscluster.RedisCluster {
 		log.Info("--> Using clustered mode")
 	}
 
+	timeout := 5 * time.Second
+
+	if cfg.Timeout > 0 {
+		timeout = time.Duration(cfg.Timeout) * time.Second
+	}
+
 	poolConf := rediscluster.PoolConfig{
-		MaxIdle:       maxIdle,
-		MaxActive:     maxActive,
-		IdleTimeout:   240 * time.Second,
-		Database:      cfg.Database,
-		Password:      cfg.Password,
-		IsCluster:     cfg.EnableCluster,
-		UseTLS:        cfg.UseSSL,
-		TLSSkipVerify: cfg.SSLInsecureSkipVerify,
+		MaxIdle:        maxIdle,
+		MaxActive:      maxActive,
+		IdleTimeout:    240 * time.Second,
+		ConnectTimeout: timeout,
+		ReadTimeout:    timeout,
+		WriteTimeout:   timeout,
+		Database:       cfg.Database,
+		Password:       cfg.Password,
+		IsCluster:      cfg.EnableCluster,
+		UseTLS:         cfg.UseSSL,
+		TLSSkipVerify:  cfg.SSLInsecureSkipVerify,
 	}
 
 	// If Redis port isn't set, use default one:

diff --git a/vendor/github.com/TykTechnologies/redigocluster/rediscluster/redishandle.go b/vendor/github.com/TykTechnologies/redigocluster/rediscluster/redishandle.go
diff --git a/vendor/github.com/gomodule/redigo/LICENSE b/vendor/github.com/gomodule/redigo/LICENSE
diff --git a/vendor/github.com/gomodule/redigo/redis/commandinfo.go b/vendor/github.com/gomodule/redigo/redis/commandinfo.go