Merge pull request #2272 from DomParfitt/fix-with-conn-cleanup

Capture error correctly in withConn
2022-11-02 12:07:47 +02:00 · 2022-11-02 12:07:47 +02:00 · 5350c18740
parent f1d6bc91b7 d1bfaba549
commit 5350c18740
1 changed files with 3 additions and 5 deletions
--- 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) {