unistack-org/micro-store-redis
4
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases 39 Wiki Activity

fixup tls redis options
Some checks failed
automerge / automerge (pull_request) Failing after 9s
Details
autoapprove / autoapprove (pull_request) Failing after 14s
Details
prbuild / test (pull_request) Successful in 10m8s
Details

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2024-12-05 12:40:57 +03:00
parent 3cd07fafaa
commit e470d0b123
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
redis.go
View File

@ -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
}
}
}