refactor: remove the non-used parameter

bailantaotao · bailantaotao · commit 21a757dd308d · 2024-06-05T16:48:23.000+08:00
diff --git a/cluster.go b/cluster.go
@@ -1070,7 +1070,7 @@ func (c *ClusterClient) reaper(idleCheckFrequency time.Duration) {
 		for _, node := range nodes {
 			_, err := node.Client.connPool.(*pool.ConnPool).ReapStaleConns()
 			if err != nil {
-				internal.Logger.Printf(c.Context(), "ReapStaleConns failed: %s", err)
+				internal.Logger.Printf("ReapStaleConns failed: %s", err)
 			}
 		}
 	}
@@ -1622,7 +1622,7 @@ func (c *ClusterClient) cmdInfo(name string) *CommandInfo {
 
 	info := cmdsInfo[name]
 	if info == nil {
-		internal.Logger.Printf(c.Context(), "info for cmd=%s not found", name)
+		internal.Logger.Printf("info for cmd=%s not found", name)
 	}
 	return info
 }
diff --git a/commands.go b/commands.go
@@ -23,7 +23,6 @@ func usePrecise(dur time.Duration) bool {
 func formatMs(ctx context.Context, dur time.Duration) int64 {
 	if dur > 0 && dur < time.Millisecond {
 		internal.Logger.Printf(
-			ctx,
 			"specified duration is %s, but minimal supported value is %s - truncating to 1ms",
 			dur, time.Millisecond,
 		)
@@ -35,7 +34,6 @@ func formatMs(ctx context.Context, dur time.Duration) int64 {
 func formatSec(ctx context.Context, dur time.Duration) int64 {
 	if dur > 0 && dur < time.Second {
 		internal.Logger.Printf(
-			ctx,
 			"specified duration is %s, but minimal supported value is %s - truncating to 1s",
 			dur, time.Second,
 		)
diff --git a/export_test.go b/export_test.go
@@ -87,7 +87,7 @@ func (state *clusterState) IsConsistent(ctx context.Context) bool {
 func GetSlavesAddrByName(ctx context.Context, c *SentinelClient, name string) []string {
 	addrs, err := c.Slaves(ctx, name).Result()
 	if err != nil {
-		internal.Logger.Printf(ctx, "sentinel: Slaves name=%q failed: %s",
+		internal.Logger.Printf("sentinel: Slaves name=%q failed: %s",
 			name, err)
 		return []string{}
 	}
diff --git a/internal/log.go b/internal/log.go
@@ -1,21 +1,20 @@
 package internal
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"os"
 )
 
 type Logging interface {
-	Printf(ctx context.Context, format string, v ...interface{})
+	Printf(format string, v ...interface{})
 }
 
 type logger struct {
 	log *log.Logger
 }
 
-func (l *logger) Printf(ctx context.Context, format string, v ...interface{}) {
+func (l *logger) Printf(format string, v ...interface{}) {
 	_ = l.log.Output(2, fmt.Sprintf(format, v...))
 }
 
diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -353,7 +353,7 @@ func (p *ConnPool) popIdle() (*Conn, error) {
 
 func (p *ConnPool) Put(ctx context.Context, cn *Conn) {
 	if cn.rd.Buffered() > 0 {
-		internal.Logger.Printf(ctx, "Conn has unread data")
+		internal.Logger.Printf("Conn has unread data")
 		p.Remove(ctx, cn, BadConnError{})
 		return
 	}
@@ -492,7 +492,7 @@ func (p *ConnPool) reaper(frequency time.Duration) {
 			}
 			_, err := p.ReapStaleConns()
 			if err != nil {
-				internal.Logger.Printf(context.Background(), "ReapStaleConns failed: %s", err)
+				internal.Logger.Printf("ReapStaleConns failed: %s", err)
 				continue
 			}
 		case <-p.closedCh:
diff --git a/pubsub.go b/pubsub.go
@@ -156,7 +156,7 @@ func (c *PubSub) closeTheCn(reason error) error {
 		return nil
 	}
 	if !c.closed {
-		internal.Logger.Printf(c.getContext(), "redis: discarding bad PubSub connection: %s", reason)
+		internal.Logger.Printf("redis: discarding bad PubSub connection: %s", reason)
 	}
 	err := c.closeConn(c.cn)
 	c.cn = nil
@@ -612,11 +612,11 @@ func (c *channel) initMsgChan() {
 					}
 				case <-timer.C:
 					c.logger.Printf(
-						ctx, "redis: %+v channel is full for %s (message is dropped)",
+						"redis: %+v channel is full for %s (message is dropped)",
 						c, c.chanSendTimeout)
 				}
 			default:
-				c.logger.Printf(ctx, "redis: unknown message type: %T", msg)
+				c.logger.Printf("redis: unknown message type: %T", msg)
 			}
 		}
 	}()
@@ -666,11 +666,11 @@ func (c *channel) initAllChan() {
 					}
 				case <-timer.C:
 					c.logger.Printf(
-						ctx, "redis: %+v channel is full for %s (message is dropped)",
+						"redis: %+v channel is full for %s (message is dropped)",
 						c, c.chanSendTimeout)
 				}
 			default:
-				c.logger.Printf(ctx, "redis: unknown message type: %T", msg)
+				c.logger.Printf("redis: unknown message type: %T", msg)
 			}
 		}
 	}()
diff --git a/ring.go b/ring.go
@@ -322,7 +322,7 @@ func (c *ringShards) Heartbeat(frequency time.Duration) {
 			err := shard.Client.Ping(ctx).Err()
 			isUp := err == nil || err == pool.ErrPoolTimeout
 			if shard.Vote(isUp) {
-				internal.Logger.Printf(context.Background(), "ring shard state changed: %s", shard)
+				internal.Logger.Printf("ring shard state changed: %s", shard)
 				rebalance = true
 			}
 		}
@@ -576,7 +576,7 @@ func (c *Ring) cmdInfo(ctx context.Context, name string) *CommandInfo {
 	}
 	info := cmdsInfo[name]
 	if info == nil {
-		internal.Logger.Printf(ctx, "info for cmd=%s not found", name)
+		internal.Logger.Printf("info for cmd=%s not found", name)
 	}
 	return info
 }
diff --git a/sentinel.go b/sentinel.go
@@ -511,7 +511,7 @@ func (c *sentinelFailover) MasterAddr(ctx context.Context) (string, error) {
 
 		masterAddr, err := sentinel.GetMasterAddrByName(ctx, c.opt.MasterName).Result()
 		if err != nil {
-			internal.Logger.Printf(ctx, "sentinel: GetMasterAddrByName master=%q failed: %s",
+			internal.Logger.Printf("sentinel: GetMasterAddrByName master=%q failed: %s",
 				c.opt.MasterName, err)
 			_ = sentinel.Close()
 			continue
@@ -558,7 +558,7 @@ func (c *sentinelFailover) slaveAddrs(ctx context.Context, useDisconnected bool)
 
 		slaves, err := sentinel.Slaves(ctx, c.opt.MasterName).Result()
 		if err != nil {
-			internal.Logger.Printf(ctx, "sentinel: Slaves master=%q failed: %s",
+			internal.Logger.Printf("sentinel: Slaves master=%q failed: %s",
 				c.opt.MasterName, err)
 			_ = sentinel.Close()
 			continue
@@ -584,7 +584,7 @@ func (c *sentinelFailover) slaveAddrs(ctx context.Context, useDisconnected bool)
 func (c *sentinelFailover) getMasterAddr(ctx context.Context, sentinel *SentinelClient) string {
 	addr, err := sentinel.GetMasterAddrByName(ctx, c.opt.MasterName).Result()
 	if err != nil {
-		internal.Logger.Printf(ctx, "sentinel: GetMasterAddrByName name=%q failed: %s",
+		internal.Logger.Printf("sentinel: GetMasterAddrByName name=%q failed: %s",
 			c.opt.MasterName, err)
 		return ""
 	}
@@ -594,7 +594,7 @@ func (c *sentinelFailover) getMasterAddr(ctx context.Context, sentinel *Sentinel
 func (c *sentinelFailover) getSlaveAddrs(ctx context.Context, sentinel *SentinelClient) []string {
 	addrs, err := sentinel.Slaves(ctx, c.opt.MasterName).Result()
 	if err != nil {
-		internal.Logger.Printf(ctx, "sentinel: Slaves name=%q failed: %s",
+		internal.Logger.Printf("sentinel: Slaves name=%q failed: %s",
 			c.opt.MasterName, err)
 		return []string{}
 	}
@@ -658,7 +658,7 @@ func (c *sentinelFailover) trySwitchMaster(ctx context.Context, addr string) {
 	}
 	c._masterAddr = addr
 
-	internal.Logger.Printf(ctx, "sentinel: new master=%q addr=%q",
+	internal.Logger.Printf("sentinel: new master=%q addr=%q",
 		c.opt.MasterName, addr)
 	if c.onFailover != nil {
 		c.onFailover(ctx, addr)
@@ -679,7 +679,7 @@ func (c *sentinelFailover) setSentinel(ctx context.Context, sentinel *SentinelCl
 func (c *sentinelFailover) discoverSentinels(ctx context.Context) {
 	sentinels, err := c.sentinel.Sentinels(ctx, c.opt.MasterName).Result()
 	if err != nil {
-		internal.Logger.Printf(ctx, "sentinel: Sentinels master=%q failed: %s", c.opt.MasterName, err)
+		internal.Logger.Printf("sentinel: Sentinels master=%q failed: %s", c.opt.MasterName, err)
 		return
 	}
 	for _, sentinel := range sentinels {
@@ -697,7 +697,7 @@ func (c *sentinelFailover) discoverSentinels(ctx context.Context) {
 		if ip != "" && port != "" {
 			sentinelAddr := net.JoinHostPort(ip, port)
 			if !contains(c.sentinelAddrs, sentinelAddr) {
-				internal.Logger.Printf(ctx, "sentinel: discovered new sentinel=%q for master=%q",
+				internal.Logger.Printf("sentinel: discovered new sentinel=%q for master=%q",
 					sentinelAddr, c.opt.MasterName)
 				c.sentinelAddrs = append(c.sentinelAddrs, sentinelAddr)
 			}
@@ -717,7 +717,7 @@ func (c *sentinelFailover) listen(pubsub *PubSub) {
 		if msg.Channel == "+switch-master" {
 			parts := strings.Split(msg.Payload, " ")
 			if parts[0] != c.opt.MasterName {
-				internal.Logger.Printf(pubsub.getContext(), "sentinel: ignore addr for master=%q", parts[0])
+				internal.Logger.Printf("sentinel: ignore addr for master=%q", parts[0])
 				continue
 			}
 			addr := net.JoinHostPort(parts[3], parts[4])

Original file line number	Diff line number	Diff line change
`@@ -1070,7 +1070,7 @@ func (c *ClusterClient) reaper(idleCheckFrequency time.Duration) {`
`1070`	`1070`	`for _, node := range nodes {`
`1071`	`1071`	`_, err := node.Client.connPool.(*pool.ConnPool).ReapStaleConns()`
`1072`	`1072`	`if err != nil {`
`1073`		`- internal.Logger.Printf(c.Context(), "ReapStaleConns failed: %s", err)`
	`1073`	`+ internal.Logger.Printf("ReapStaleConns failed: %s", err)`
`1074`	`1074`	`}`
`1075`	`1075`	`}`
`1076`	`1076`	`}`
`@@ -1622,7 +1622,7 @@ func (c ClusterClient) cmdInfo(name string) CommandInfo {`
`1622`	`1622`
`1623`	`1623`	`info := cmdsInfo[name]`
`1624`	`1624`	`if info == nil {`
`1625`		`- internal.Logger.Printf(c.Context(), "info for cmd=%s not found", name)`
	`1625`	`+ internal.Logger.Printf("info for cmd=%s not found", name)`
`1626`	`1626`	`}`
`1627`	`1627`	`return info`
`1628`	`1628`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ func (state *clusterState) IsConsistent(ctx context.Context) bool {`
`87`	`87`	`func GetSlavesAddrByName(ctx context.Context, c *SentinelClient, name string) []string {`
`88`	`88`	`addrs, err := c.Slaves(ctx, name).Result()`
`89`	`89`	`if err != nil {`
`90`		`- internal.Logger.Printf(ctx, "sentinel: Slaves name=%q failed: %s",`
	`90`	`+ internal.Logger.Printf("sentinel: Slaves name=%q failed: %s",`
`91`	`91`	`name, err)`
`92`	`92`	`return []string{}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,20 @@`
`1`	`1`	`package internal`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "context"`
`5`	`4`	`"fmt"`
`6`	`5`	`"log"`
`7`	`6`	`"os"`
`8`	`7`	`)`
`9`	`8`
`10`	`9`	`type Logging interface {`
`11`		`- Printf(ctx context.Context, format string, v ...interface{})`
	`10`	`+ Printf(format string, v ...interface{})`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`type logger struct {`
`15`	`14`	`log *log.Logger`
`16`	`15`	`}`
`17`	`16`
`18`		`-func (l *logger) Printf(ctx context.Context, format string, v ...interface{}) {`
	`17`	`+func (l *logger) Printf(format string, v ...interface{}) {`
`19`	`18`	`_ = l.log.Output(2, fmt.Sprintf(format, v...))`
`20`	`19`	`}`
`21`	`20`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ func (p ConnPool) popIdle() (Conn, error) {`
`353`	`353`
`354`	`354`	`func (p ConnPool) Put(ctx context.Context, cn Conn) {`
`355`	`355`	`if cn.rd.Buffered() > 0 {`
`356`		`- internal.Logger.Printf(ctx, "Conn has unread data")`
	`356`	`+ internal.Logger.Printf("Conn has unread data")`
`357`	`357`	`p.Remove(ctx, cn, BadConnError{})`
`358`	`358`	`return`
`359`	`359`	`}`
`@@ -492,7 +492,7 @@ func (p *ConnPool) reaper(frequency time.Duration) {`
`492`	`492`	`}`
`493`	`493`	`_, err := p.ReapStaleConns()`
`494`	`494`	`if err != nil {`
`495`		`- internal.Logger.Printf(context.Background(), "ReapStaleConns failed: %s", err)`
	`495`	`+ internal.Logger.Printf("ReapStaleConns failed: %s", err)`
`496`	`496`	`continue`
`497`	`497`	`}`
`498`	`498`	`case <-p.closedCh:`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ func (c *PubSub) closeTheCn(reason error) error {`
`156`	`156`	`return nil`
`157`	`157`	`}`
`158`	`158`	`if !c.closed {`
`159`		`- internal.Logger.Printf(c.getContext(), "redis: discarding bad PubSub connection: %s", reason)`
	`159`	`+ internal.Logger.Printf("redis: discarding bad PubSub connection: %s", reason)`
`160`	`160`	`}`
`161`	`161`	`err := c.closeConn(c.cn)`
`162`	`162`	`c.cn = nil`
`@@ -612,11 +612,11 @@ func (c *channel) initMsgChan() {`
`612`	`612`	`}`
`613`	`613`	`case <-timer.C:`
`614`	`614`	`c.logger.Printf(`
`615`		`- ctx, "redis: %+v channel is full for %s (message is dropped)",`
	`615`	`+ "redis: %+v channel is full for %s (message is dropped)",`
`616`	`616`	`c, c.chanSendTimeout)`
`617`	`617`	`}`
`618`	`618`	`default:`
`619`		`- c.logger.Printf(ctx, "redis: unknown message type: %T", msg)`
	`619`	`+ c.logger.Printf("redis: unknown message type: %T", msg)`
`620`	`620`	`}`
`621`	`621`	`}`
`622`	`622`	`}()`
`@@ -666,11 +666,11 @@ func (c *channel) initAllChan() {`
`666`	`666`	`}`
`667`	`667`	`case <-timer.C:`
`668`	`668`	`c.logger.Printf(`
`669`		`- ctx, "redis: %+v channel is full for %s (message is dropped)",`
	`669`	`+ "redis: %+v channel is full for %s (message is dropped)",`
`670`	`670`	`c, c.chanSendTimeout)`
`671`	`671`	`}`
`672`	`672`	`default:`
`673`		`- c.logger.Printf(ctx, "redis: unknown message type: %T", msg)`
	`673`	`+ c.logger.Printf("redis: unknown message type: %T", msg)`
`674`	`674`	`}`
`675`	`675`	`}`
`676`	`676`	`}()`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ func (c *ringShards) Heartbeat(frequency time.Duration) {`
`322`	`322`	`err := shard.Client.Ping(ctx).Err()`
`323`	`323`	`isUp := err == nil \|\| err == pool.ErrPoolTimeout`
`324`	`324`	`if shard.Vote(isUp) {`
`325`		`- internal.Logger.Printf(context.Background(), "ring shard state changed: %s", shard)`
	`325`	`+ internal.Logger.Printf("ring shard state changed: %s", shard)`
`326`	`326`	`rebalance = true`
`327`	`327`	`}`
`328`	`328`	`}`
`@@ -576,7 +576,7 @@ func (c Ring) cmdInfo(ctx context.Context, name string) CommandInfo {`
`576`	`576`	`}`
`577`	`577`	`info := cmdsInfo[name]`
`578`	`578`	`if info == nil {`
`579`		`- internal.Logger.Printf(ctx, "info for cmd=%s not found", name)`
	`579`	`+ internal.Logger.Printf("info for cmd=%s not found", name)`
`580`	`580`	`}`
`581`	`581`	`return info`
`582`	`582`	`}`