redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-12-02 06:22:31 +03:00
Code Activity

chore: refactor everything so slog.Logger can satisfy LoggerWithLevel interface

Browse Source
This commit is contained in:
ccoVeille
2025-11-08 00:30:06 +01:00
parent 14e25d740b
commit 92148e72b1
16 changed files with 325 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osscluster.go
View File

@@ -20,6 +20,7 @@ import (
"github.com/redis/go-redis/v9/internal/pool"
"github.com/redis/go-redis/v9/internal/proto"
"github.com/redis/go-redis/v9/internal/rand"
"github.com/redis/go-redis/v9/logging"
"github.com/redis/go-redis/v9/maintnotifications"
"github.com/redis/go-redis/v9/push"
)
@@ -150,7 +151,7 @@ type ClusterOptions struct {
MaintNotificationsConfig *maintnotifications.Config
// Logger is an optional logger for logging cluster-related messages.
Logger internal.LoggerWithLevel
Logger *logging.CustomLogger
}
func (opt *ClusterOptions) init() {
@@ -708,12 +709,12 @@ func (c *clusterNodes) Random() (*clusterNode, error) {
return c.GetOrCreate(addrs[n])
}
func (c *clusterNodes) logger() internal.LoggerWithLevel {
if c.opt.Logger != nil {
return c.opt.Logger
} else {
return internal.LegacyLoggerWithLevel
func (c *clusterNodes) logger() *logging.CustomLogger {
var logger *logging.CustomLogger
if c.opt != nil && c.opt.Logger != nil {
logger = c.opt.Logger
}
return logger
}
//------------------------------------------------------------------------------
@@ -2139,12 +2140,12 @@ func (c *ClusterClient) context(ctx context.Context) context.Context {
return context.Background()
}
func (c *ClusterClient) logger() internal.LoggerWithLevel {
if c.opt.Logger != nil {
return c.opt.Logger
} else {
return internal.LegacyLoggerWithLevel
func (c *ClusterClient) logger() *logging.CustomLogger {
var logger *logging.CustomLogger
if c.opt != nil && c.opt.Logger != nil {
logger = c.opt.Logger
}
return logger
}
func appendIfNotExist[T comparable](vals []T, newVal T) []T {