Skip to content

Commit b4dabfc

Browse files
committed
close rows
1 parent 3d82c0c commit b4dabfc

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

lib/ipni/ipni-provider/ipni-provider.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ func NewProvider(api ipniAPI, deps *deps.Deps) (*Provider, error) {
9292
return nil, xerrors.Errorf("failed to get private libp2p keys from DB: %w", err)
9393
}
9494

95+
defer rows.Close()
96+
9597
for rows.Next() && rows.Err() == nil {
9698
var priv []byte
9799
err := rows.Scan(&priv)
@@ -284,14 +286,16 @@ func (p *Provider) GetEntry(block cid.Cid, provider string) ([]byte, error) {
284286

285287
var pis []abi.PieceInfo
286288

287-
row, err := p.db.Query(ctx, `SELECT context_id FROM ipni WHERE entries = $1 AND provider = $2`, block.String(), provider)
289+
rows, err := p.db.Query(ctx, `SELECT context_id FROM ipni WHERE entries = $1 AND provider = $2`, block.String(), provider)
288290
if err != nil {
289291
return nil, xerrors.Errorf("querying ads with entry link %s: %w", block, err)
290292
}
291293

292-
for row.Next() && row.Err() == nil {
294+
defer rows.Close()
295+
296+
for rows.Next() && rows.Err() == nil {
293297
var contextID []byte
294-
err := row.Scan(&contextID)
298+
err := rows.Scan(&contextID)
295299
if err != nil {
296300
return nil, xerrors.Errorf("failed to scan the row: %w", err)
297301
}
@@ -305,7 +309,7 @@ func (p *Provider) GetEntry(block cid.Cid, provider string) ([]byte, error) {
305309
pis = append(pis, pi)
306310
}
307311

308-
if row.Err() != nil {
312+
if rows.Err() != nil {
309313
return nil, err
310314
}
311315

web/api/webrpc/sync_state.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ func (a *WebRPC) loadConfigs(ctx context.Context) (map[string]string, error) {
4343
return nil, xerrors.Errorf("getting db configs: %w", err)
4444
}
4545

46+
defer rows.Close()
47+
4648
configs := make(map[string]string)
4749
for rows.Next() {
4850
var title, config string

0 commit comments

Comments
 (0)