fix: capture error correctly in withConn

DomParfitt · DomParfitt · commit d1bfaba549fe · 2022-11-02T09:11:36.000Z
diff --git a/redis.go b/redis.go
@@ -288,11 +288,9 @@ func (c *baseClient) withConn(
 		return err
 	}
 
-	defer func() {
-		c.releaseConn(ctx, cn, err)
-	}()
-
-	return fn(ctx, cn)
+	err = fn(ctx, cn)
+	c.releaseConn(ctx, cn, err)
+	return err
 }
 
 func (c *baseClient) dial(ctx context.Context, network, addr string) (net.Conn, error) {

Original file line number	Diff line number	Diff line change
`@@ -288,11 +288,9 @@ func (c *baseClient) withConn(`
`288`	`288`	`return err`
`289`	`289`	`}`
`290`	`290`
`291`		`- defer func() {`
`292`		`- c.releaseConn(ctx, cn, err)`
`293`		`- }()`
`294`		`-`
`295`		`- return fn(ctx, cn)`
	`291`	`+ err = fn(ctx, cn)`
	`292`	`+ c.releaseConn(ctx, cn, err)`
	`293`	`+ return err`
`296`	`294`	`}`
`297`	`295`
`298`	`296`	`func (c *baseClient) dial(ctx context.Context, network, addr string) (net.Conn, error) {`