From 4008b9aa2533585390afdf1fed4d37f4982d2664 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Sat, 9 May 2026 02:14:47 +0000 Subject: [PATCH] lint: fix errcheck for txn.Rollback/Commit and r.Close Use lint.LogOnErrRollback for deferred Rollback in test-jet. Use lint.LogOnErrCtx for Commit in test-jet. Use lint.LogOnErr for r.Close in ExecuteNoneTxBob. --- cmd/test-jet/main.go | 5 +++-- db/connection.go | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/test-jet/main.go b/cmd/test-jet/main.go index 25ca7946..d4c69a7a 100644 --- a/cmd/test-jet/main.go +++ b/cmd/test-jet/main.go @@ -8,6 +8,7 @@ import ( "github.com/Gleipnir-Technology/nidus-sync/config" "github.com/Gleipnir-Technology/nidus-sync/db" "github.com/Gleipnir-Technology/nidus-sync/db/query/public" + "github.com/Gleipnir-Technology/nidus-sync/lint" ) func main() { @@ -28,7 +29,7 @@ func main() { log.Printf("failed on txn: %v", err) os.Exit(3) } - defer txn.Rollback(ctx) + defer lint.LogOnErrRollback(txn.Rollback, ctx, "rollback") log.Printf("doing address") gid := "openaddresses:address:us/ca/tulare-addresses-county:0dc28458fd03e3fa" address, err := public.AddressFromGID(ctx, txn, gid) @@ -38,7 +39,7 @@ func main() { } //log.Printf("address %d lat %f lng %f", address.ID, *address.LocationLatitude, *address.LocationLongitude) log.Printf("Address id %d location %s", address.ID, address.Location) - txn.Commit(ctx) + lint.LogOnErrCtx(txn.Commit, ctx, "commit") /* log.Printf("doing comm") diff --git a/db/connection.go b/db/connection.go index b79e039c..2f7294fa 100644 --- a/db/connection.go +++ b/db/connection.go @@ -12,6 +12,7 @@ import ( //"github.com/jackc/pgx/v5" "github.com/Gleipnir-Technology/bob" "github.com/Gleipnir-Technology/jet/postgres" + "github.com/Gleipnir-Technology/nidus-sync/lint" "github.com/jackc/pgx/v5" "github.com/jackc/pgx/v5/pgxpool" "github.com/jackc/pgx/v5/stdlib" @@ -58,7 +59,7 @@ func ExecuteNoneTxBob(ctx context.Context, txn bob.Tx, stmt postgres.Statement) if err != nil { return fmt.Errorf("query: %w", err) } - r.Close() + defer lint.LogOnErr(r.Close, "close rows") return nil } func ExecuteOne[T any](ctx context.Context, stmt postgres.Statement) (T, error) {