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

make linter happy

Browse Source
This commit is contained in:
Nedyalko Dyakov
2025-11-29 01:12:18 +02:00
parent c80f50b528
commit dc13aefe66
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
redis.go
View File

@@ -401,7 +401,8 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
// Another goroutine is initializing - WAIT for it to complete // Another goroutine is initializing - WAIT for it to complete
// Use a context with timeout = min(remaining command timeout, DialTimeout) // Use a context with timeout = min(remaining command timeout, DialTimeout)
// This prevents waiting too long while respecting the caller's deadline // This prevents waiting too long while respecting the caller's deadline
waitCtx := ctx var waitCtx context.Context
var cancel context.CancelFunc
dialTimeout := c.opt.DialTimeout dialTimeout := c.opt.DialTimeout
if cmdDeadline, hasCmdDeadline := ctx.Deadline(); hasCmdDeadline { if cmdDeadline, hasCmdDeadline := ctx.Deadline(); hasCmdDeadline {
@@ -413,13 +414,11 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
waitCtx = ctx waitCtx = ctx
} else { } else {
// DialTimeout is shorter, cap the wait at DialTimeout // DialTimeout is shorter, cap the wait at DialTimeout
var cancel context.CancelFunc
waitCtx, cancel = context.WithTimeout(ctx, dialTimeout) waitCtx, cancel = context.WithTimeout(ctx, dialTimeout)
defer cancel() defer cancel()
} }
} else { } else {
// No command deadline, use DialTimeout to prevent waiting indefinitely // No command deadline, use DialTimeout to prevent waiting indefinitely
var cancel context.CancelFunc
waitCtx, cancel = context.WithTimeout(ctx, dialTimeout) waitCtx, cancel = context.WithTimeout(ctx, dialTimeout)
defer cancel() defer cancel()
} }