From 90b70f315f89113067eeff9ca8fcea3a42d873c7 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 13 Sep 2023 17:14:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AE=A2=E6=88=B7=E7=AB=AFre?= =?UTF-8?q?dis=E9=93=BE=E6=8E=A5=E6=B1=A0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lego/sys/redis/cluster/core.go | 3 ++- lego/sys/redis/options.go | 7 +++++-- lego/sys/redis/redis.go | 2 ++ lego/sys/redis/single/core.go | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lego/sys/redis/cluster/core.go b/lego/sys/redis/cluster/core.go index 110a17ae6..6f2dd2b8a 100644 --- a/lego/sys/redis/cluster/core.go +++ b/lego/sys/redis/cluster/core.go @@ -8,7 +8,7 @@ import ( "github.com/go-redis/redis/v8" ) -func NewSys(RedisUrl []string, RedisPassword string, poolSize int, timeOut time.Duration, +func NewSys(RedisUrl []string, RedisPassword string, poolSize, minConns int, timeOut time.Duration, codec core.ICodec, ) (sys *Redis, err error) { var ( @@ -18,6 +18,7 @@ func NewSys(RedisUrl []string, RedisPassword string, poolSize int, timeOut time. Addrs: RedisUrl, Password: RedisPassword, PoolSize: poolSize, + MinIdleConns: minConns, DialTimeout: timeOut, ReadTimeout: timeOut, WriteTimeout: timeOut, diff --git a/lego/sys/redis/options.go b/lego/sys/redis/options.go index a02917982..008b31577 100644 --- a/lego/sys/redis/options.go +++ b/lego/sys/redis/options.go @@ -23,6 +23,7 @@ type Options struct { Redis_Cluster_Addr []string Redis_Cluster_Password string PoolSize int + MinConns int TimeOut time.Duration Codec core.ICodec } @@ -82,7 +83,8 @@ func newOptions(config map[string]interface{}, opts ...Option) Options { Redis_Single_DB: 1, Redis_Cluster_Addr: []string{"127.0.0.1:6379"}, Redis_Cluster_Password: "", - PoolSize: 200, + PoolSize: 64, + MinConns: 32, TimeOut: time.Second * 3, } if config != nil { @@ -101,7 +103,8 @@ func newOptionsByOption(opts ...Option) Options { Redis_Single_DB: 1, Redis_Cluster_Addr: []string{"127.0.0.1:6379"}, Redis_Cluster_Password: "", - PoolSize: 200, + PoolSize: 64, + MinConns: 32, TimeOut: time.Second * 3, } for _, o := range opts { diff --git a/lego/sys/redis/redis.go b/lego/sys/redis/redis.go index f09b074c1..cebfa56f2 100644 --- a/lego/sys/redis/redis.go +++ b/lego/sys/redis/redis.go @@ -31,6 +31,7 @@ func (this *Redis) init() (err error) { this.options.Redis_Single_Password, this.options.Redis_Single_DB, this.options.PoolSize, + this.options.MinConns, this.options.TimeOut, this, ) @@ -39,6 +40,7 @@ func (this *Redis) init() (err error) { this.options.Redis_Cluster_Addr, this.options.Redis_Cluster_Password, this.options.PoolSize, + this.options.MinConns, this.options.TimeOut, this, ) diff --git a/lego/sys/redis/single/core.go b/lego/sys/redis/single/core.go index d90bf22fd..53a70ffe6 100644 --- a/lego/sys/redis/single/core.go +++ b/lego/sys/redis/single/core.go @@ -8,7 +8,7 @@ import ( "github.com/go-redis/redis/v8" ) -func NewSys(RedisUrl, RedisPassword string, RedisDB int, poolSize int, timeOut time.Duration, +func NewSys(RedisUrl, RedisPassword string, RedisDB int, poolSize, minConns int, timeOut time.Duration, codec core.ICodec, ) (sys *Redis, err error) { var ( @@ -19,6 +19,7 @@ func NewSys(RedisUrl, RedisPassword string, RedisDB int, poolSize int, timeOut t Password: RedisPassword, DB: RedisDB, PoolSize: poolSize, + MinIdleConns: minConns, DialTimeout: timeOut, WriteTimeout: timeOut, ReadTimeout: timeOut,