git.iko.soy/crush
on main help sign in
ci: fix linting
commit1fa4e8a385ba34cda5ee6907a2d15aa31c24a675 authorAndrey Nering <andreynering@users.noreply.github.com> dateMon 30 Jun 2025, 17:32 (1 year ago) parent53668f1
3 files changed+10−9
compare with main
unifiedsplit
cmd/root.go+5−5 internal/db/connect.go+4−3 internal/history/file.go+1−1
cmd/root.go+5−5
@@ -77,16 +77,16 @@ to assist developers in writing, debugging, and understanding code directly from
7777 return err
7878 }
7979
80+ // Create main context for the application
81+ ctx, cancel := context.WithCancel(context.Background())
82+ defer cancel()
83+
8084 // Connect DB, this will also run migrations
81− conn, err := db.Connect()
85+ conn, err := db.Connect(ctx)
8286 if err != nil {
8387 return err
8488 }
8589
86− // Create main context for the application
87− ctx, cancel := context.WithCancel(context.Background())
88− defer cancel()
89−
9090 app, err := app.New(ctx, conn)
9191 if err != nil {
9292 logging.Error("Failed to create app: %v", err)
internal/db/connect.go+4−3
@@ -1,6 +1,7 @@
11package db
22
33import (
4+ "context"
45 "database/sql"
56 "fmt"
67 "os"
@@ -15,7 +16,7 @@ import (
1516 "github.com/pressly/goose/v3"
1617)
1718
18−func Connect() (*sql.DB, error) {
19+func Connect(ctx context.Context) (*sql.DB, error) {
1920 dataDir := config.Get().Data.Directory
2021 if dataDir == "" {
2122 return nil, fmt.Errorf("data.dir is not set")
@@ -31,7 +32,7 @@ func Connect() (*sql.DB, error) {
3132 }
3233
3334 // Verify connection
34− if err = db.Ping(); err != nil {
35+ if err = db.PingContext(ctx); err != nil {
3536 db.Close()
3637 return nil, fmt.Errorf("failed to connect to database: %w", err)
3738 }
@@ -46,7 +47,7 @@ func Connect() (*sql.DB, error) {
4647 }
4748
4849 for _, pragma := range pragmas {
49− if _, err = db.Exec(pragma); err != nil {
50+ if _, err = db.ExecContext(ctx, pragma); err != nil {
5051 logging.Error("Failed to set pragma", pragma, err)
5152 } else {
5253 logging.Debug("Set pragma", "pragma", pragma)
internal/history/file.go+1−1
@@ -83,7 +83,7 @@ func (s *service) createWithVersion(ctx context.Context, sessionID, path, conten
8383 // Retry loop for transaction conflicts
8484 for attempt := range maxRetries {
8585 // Start a transaction
86− tx, txErr := s.db.Begin()
86+ tx, txErr := s.db.BeginTx(ctx, nil)
8787 if txErr != nil {
8888 return File{}, fmt.Errorf("failed to begin transaction: %w", txErr)
8989 }