update all

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
fixup nil pointer assign
2024-10-14 17:49:38 +03:00 · 2024-10-08 16:52:26 +03:00
4 changed files with 12 additions and 10 deletions
--- a/go.mod
+++ b/go.mod
@@ -5,9 +5,9 @@ go 1.22
 toolchain go1.22.4

 require (
-	github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5
-	github.com/redis/go-redis/v9 v9.6.1
-	go.unistack.org/micro/v3 v3.10.96
+	github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3
+	github.com/redis/go-redis/v9 v9.6.2
+	go.unistack.org/micro/v3 v3.10.97
 )

 require (
--- a/go.sum
+++ b/go.sum
@@ -13,12 +13,18 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 h1:EaDatTxkdHG+U3Bk4EUr+DZ7fOGwTfezUiUJMaIcaho=
 github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5/go.mod h1:fyalQWdtzDBECAQFBJuQe5bzQ02jGd5Qcbgb97Flm7U=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3 h1:1/BDligzCa40GTllkDnY3Y5DTHuKCONbB2JcRyIfl20=
+github.com/redis/go-redis/extra/rediscmd/v9 v9.5.3/go.mod h1:3dZmcLn3Qw6FLlWASn1g4y+YO9ycEFUOM+bhBmzLVKQ=
 github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDOjzMvcuQHk=
 github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4=
 github.com/redis/go-redis/v9 v9.6.1/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
+github.com/redis/go-redis/v9 v9.6.2 h1:w0uvkRbc9KpgD98zcvo5IrVUsn0lXpRMuhNgiHDJzdk=
+github.com/redis/go-redis/v9 v9.6.2/go.mod h1:0C0c6ycQsdpVNQpxb1njEQIqkx5UcsM8FJCQLgE9+RA=
 go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
 go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
 go.unistack.org/micro/v3 v3.10.96 h1:njukb0DlXOJspX5mLSwcP7+cVSg/8Fy+6++mYkOpY2A=
 go.unistack.org/micro/v3 v3.10.96/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
 google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
 google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
--- a/options.go
+++ b/options.go
@@ -61,7 +61,7 @@ func NewOptions(opts ...Option) Options {
 			labelName, options.RedisName),
 	)

-	options.Logger = options.Logger.Clone(logger.WithCallerSkipCount(1))
+	options.Logger = options.Logger.Clone(logger.WithAddCallerSkipCount(1))

 	return options
 }
--- a/redis.go
+++ b/redis.go
@@ -625,12 +625,12 @@ func NewStore(opts ...store.Option) *Store {
 }

 func (r *Store) configure() error {
-	universalOptions := &goredis.UniversalOptions{}
-
 	if r.cli != nil && r.opts.Context == nil {
 		return nil
 	}

+	universalOptions := DefaultUniversalOptions
+
 	if r.opts.Context != nil {
 		if o, ok := r.opts.Context.Value(configKey{}).(*goredis.Options); ok {
 			universalOptions.Addrs = []string{o.Addr}
@@ -704,10 +704,6 @@ func (r *Store) configure() error {
 		}
 	}

-	if universalOptions == nil {
-		universalOptions = DefaultUniversalOptions
-	}
-
 	if len(r.opts.Addrs) > 0 {
 		universalOptions.Addrs = r.opts.Addrs
 	} else {
Author	SHA1	Message	Date
Vasiliy Tolstov	757fe0245b	update all Some checks failed codeql / analyze (go) (push) Failing after 42s Details build / test (push) Failing after 4m53s Details build / lint (push) Successful in 9m28s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-10-14 17:49:38 +03:00
Vasiliy Tolstov	27eccc1ed2	fixup nil pointer assign Some checks failed codeql / analyze (go) (push) Failing after 41s Details build / test (push) Failing after 4m52s Details build / lint (push) Successful in 9m29s Details Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>	2024-10-08 16:52:26 +03:00