From e470d0b12302eebc27c1d39c77c503251d347af1 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Thu, 5 Dec 2024 12:40:57 +0300 Subject: [PATCH] fixup tls redis options Signed-off-by: Vasiliy Tolstov --- redis.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/redis.go b/redis.go index 9db91f4..ae01f31 100755 --- a/redis.go +++ b/redis.go @@ -98,11 +98,7 @@ func (r *Store) Connect(ctx context.Context) error { } func (r *Store) Init(opts ...store.Option) error { - for _, o := range opts { - o(&r.opts) - } - - err := r.configure() + err := r.configure(opts...) if err != nil { return err } @@ -675,11 +671,15 @@ func NewStore(opts ...store.Option) *Store { } } -func (r *Store) configure() error { - if r.cli != nil && r.opts.Context == nil { +func (r *Store) configure(opts ...store.Option) error { + if r.cli != nil && len(opts) == 0 { return nil } + for _, o := range opts { + o(&r.opts) + } + universalOptions := DefaultUniversalOptions if r.opts.Context != nil { @@ -708,8 +708,8 @@ func (r *Store) configure() error { universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime universalOptions.ConnMaxLifetime = o.ConnMaxLifetime - if r.opts.TLSConfig != nil { - universalOptions.TLSConfig = r.opts.TLSConfig + if o.TLSConfig != nil { + universalOptions.TLSConfig = o.TLSConfig } } @@ -742,15 +742,15 @@ func (r *Store) configure() error { universalOptions.MaxIdleConns = o.MaxIdleConns universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime universalOptions.ConnMaxLifetime = o.ConnMaxLifetime - if r.opts.TLSConfig != nil { - universalOptions.TLSConfig = r.opts.TLSConfig + if o.TLSConfig != nil { + universalOptions.TLSConfig = o.TLSConfig } } if o, ok := r.opts.Context.Value(universalConfigKey{}).(*goredis.UniversalOptions); ok { universalOptions = o - if r.opts.TLSConfig != nil { - universalOptions.TLSConfig = r.opts.TLSConfig + if o.TLSConfig != nil { + universalOptions.TLSConfig = o.TLSConfig } } }