ci: fix linting

This commit is contained in:
Andrey Nering
2025-06-30 17:32:37 -03:00
parent 53668f1cfc
commit 1fa4e8a385
3 changed files with 11 additions and 10 deletions

View File

@@ -77,16 +77,16 @@ to assist developers in writing, debugging, and understanding code directly from
return err
}
// Connect DB, this will also run migrations
conn, err := db.Connect()
if err != nil {
return err
}
// Create main context for the application
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
// Connect DB, this will also run migrations
conn, err := db.Connect(ctx)
if err != nil {
return err
}
app, err := app.New(ctx, conn)
if err != nil {
logging.Error("Failed to create app: %v", err)

View File

@@ -1,6 +1,7 @@
package db
import (
"context"
"database/sql"
"fmt"
"os"
@@ -15,7 +16,7 @@ import (
"github.com/pressly/goose/v3"
)
func Connect() (*sql.DB, error) {
func Connect(ctx context.Context) (*sql.DB, error) {
dataDir := config.Get().Data.Directory
if dataDir == "" {
return nil, fmt.Errorf("data.dir is not set")
@@ -31,7 +32,7 @@ func Connect() (*sql.DB, error) {
}
// Verify connection
if err = db.Ping(); err != nil {
if err = db.PingContext(ctx); err != nil {
db.Close()
return nil, fmt.Errorf("failed to connect to database: %w", err)
}
@@ -46,7 +47,7 @@ func Connect() (*sql.DB, error) {
}
for _, pragma := range pragmas {
if _, err = db.Exec(pragma); err != nil {
if _, err = db.ExecContext(ctx, pragma); err != nil {
logging.Error("Failed to set pragma", pragma, err)
} else {
logging.Debug("Set pragma", "pragma", pragma)

View File

@@ -83,7 +83,7 @@ func (s *service) createWithVersion(ctx context.Context, sessionID, path, conten
// Retry loop for transaction conflicts
for attempt := range maxRetries {
// Start a transaction
tx, txErr := s.db.Begin()
tx, txErr := s.db.BeginTx(ctx, nil)
if txErr != nil {
return File{}, fmt.Errorf("failed to begin transaction: %w", txErr)
}