Merge pull request #409 from charredlot/close-conn

ernado · web-flow · commit f3dc1fe60bb5 · 2024-07-01T13:19:56.000+03:00
fix(query): always close client.conn in cancelQuery (issue #405)
diff --git a/query.go b/query.go
@@ -36,16 +36,18 @@ func (c *Client) cancelQuery() error {
 		Buf: make([]byte, 1),
 	}
 	proto.ClientCodeCancel.Encode(&b)
+
+	var retErr error
 	if err := c.flushBuf(ctx, &b); err != nil {
-		return errors.Wrap(err, "flush")
+		retErr = errors.Join(retErr, errors.Wrap(err, "flush"))
 	}
 
-	// Closing connection to prevent further queries.
+	// Always close connection to prevent further queries.
 	if err := c.Close(); err != nil {
-		return errors.Wrap(err, "close")
+		retErr = errors.Join(retErr, errors.Wrap(err, "close"))
 	}
 
-	return nil
+	return retErr
 }
 
 func (c *Client) querySettings(q Query) []proto.Setting {

Original file line number	Diff line number	Diff line change
`@@ -36,16 +36,18 @@ func (c *Client) cancelQuery() error {`
`36`	`36`	`Buf: make([]byte, 1),`
`37`	`37`	`}`
`38`	`38`	`proto.ClientCodeCancel.Encode(&b)`
	`39`	`+`
	`40`	`+ var retErr error`
`39`	`41`	`if err := c.flushBuf(ctx, &b); err != nil {`
`40`		`- return errors.Wrap(err, "flush")`
	`42`	`+ retErr = errors.Join(retErr, errors.Wrap(err, "flush"))`
`41`	`43`	`}`
`42`	`44`
`43`		`- // Closing connection to prevent further queries.`
	`45`	`+ // Always close connection to prevent further queries.`
`44`	`46`	`if err := c.Close(); err != nil {`
`45`		`- return errors.Wrap(err, "close")`
	`47`	`+ retErr = errors.Join(retErr, errors.Wrap(err, "close"))`
`46`	`48`	`}`
`47`	`49`
`48`		`- return nil`
	`50`	`+ return retErr`
`49`	`51`	`}`
`50`	`52`
`51`	`53`	`func (c *Client) querySettings(q Query) []proto.Setting {`