zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-06-27 22:41:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(redis): minor refactor (#5666)

Browse Source
This commit is contained in:
Kevin Wan
2026-06-27 19:18:46 +08:00
committed by GitHub
parent dbc71bb57b
commit 99515480cf
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
core/stores/redis/redis.go
View File

@@ -160,20 +160,6 @@ func NewRedis(conf RedisConf, opts ...Option) (*Redis, error) {
return rds, nil return rds, nil
} }
func newRedis(addr string, opts ...Option) *Redis {
r := &Redis{
Addr: addr,
Type: NodeType,
brk: breaker.NewBreaker(),
}
for _, opt := range opts {
opt(r)
}
return r
}
// NewScript returns a new Script instance. // NewScript returns a new Script instance.
func NewScript(script string) *Script { func NewScript(script string) *Script {
return red.NewScript(script) return red.NewScript(script)
@@ -2699,6 +2685,18 @@ func (s *Redis) checkConnection(pingTimeout time.Duration) error {
return conn.Ping(ctx).Err() return conn.Ping(ctx).Err()
} }
// maintNotificationsConfig builds the go-redis maintenance notifications config
// from the configured mode, defaulting to disabled when unset so that the
// CLIENT MAINT_NOTIFICATIONS command is not issued on connect.
func (r *Redis) maintNotificationsConfig() *maintnotifications.Config {
mode := r.maintNotifications
if len(mode) == 0 {
mode = maintnotifications.ModeDisabled
}
return &maintnotifications.Config{Mode: mode}
}
// Cluster customizes the given Redis as a cluster. // Cluster customizes the given Redis as a cluster.
func Cluster() Option { func Cluster() Option {
return func(r *Redis) { return func(r *Redis) {
@@ -2761,18 +2759,6 @@ func WithMaintNotifications(mode string) Option {
} }
} }
// maintNotificationsConfig builds the go-redis maintenance notifications config
// from the configured mode, defaulting to disabled when unset so that the
// CLIENT MAINT_NOTIFICATIONS command is not issued on connect.
func (r *Redis) maintNotificationsConfig() *maintnotifications.Config {
mode := r.maintNotifications
if mode == "" {
mode = maintnotifications.ModeDisabled
}
return &maintnotifications.Config{Mode: mode}
}
func acceptable(err error) bool { func acceptable(err error) bool {
return err == nil || errorx.In(err, red.Nil, context.Canceled) return err == nil || errorx.In(err, red.Nil, context.Canceled)
} }
@@ -2788,6 +2774,20 @@ func getRedis(r *Redis) (RedisNode, error) {
} }
} }
func newRedis(addr string, opts ...Option) *Redis {
r := &Redis{
Addr: addr,
Type: NodeType,
brk: breaker.NewBreaker(),
}
for _, opt := range opts {
opt(r)
}
return r
}
func toPairs(vals []red.Z) []Pair { func toPairs(vals []red.Z) []Pair {
pairs := make([]Pair, len(vals)) pairs := make([]Pair, len(vals))
for i, val := range vals { for i, val := range vals {