From 9c09b4466f70bc52a4bf2e7b4dc17a1f81f18d7c Mon Sep 17 00:00:00 2001 From: brookjeynes Date: Wed, 15 Oct 2025 07:07:22 +1000 Subject: [PATCH] feat(db): use slogger Change-Id: ztulxmxuwlttlqstplkxwnxnqqwzlwsx Signed-off-by: brookjeynes --- internal/db/db.go | 11 +++++++---- internal/server/app.go | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/internal/db/db.go b/internal/db/db.go index 7e063bb..90d2512 100644 --- a/internal/db/db.go +++ b/internal/db/db.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "fmt" + "log/slog" "strings" _ "github.com/mattn/go-sqlite3" @@ -11,6 +12,7 @@ import ( type DB struct { *sql.DB + logger *slog.Logger } type Execer interface { @@ -24,7 +26,7 @@ type Execer interface { PrepareContext(ctx context.Context, query string) (*sql.Stmt, error) } -func Make(dbPath string) (*DB, error) { +func Make(ctx context.Context, dbPath string, logger *slog.Logger) (*DB, error) { opts := []string{ "_foreign_keys=1", "_journal_mode=WAL", @@ -37,8 +39,6 @@ func Make(dbPath string) (*DB, error) { return nil, fmt.Errorf("failed to open db: %w", err) } - ctx := context.Background() - conn, err := db.Conn(ctx) if err != nil { return nil, err @@ -231,5 +231,8 @@ func Make(dbPath string) (*DB, error) { return nil, fmt.Errorf("failed to execute db create statement: %w", err) } - return &DB{db}, nil + return &DB{ + db, + logger, + }, nil } diff --git a/internal/server/app.go b/internal/server/app.go index 8eeb61b..c7cf92f 100644 --- a/internal/server/app.go +++ b/internal/server/app.go @@ -51,7 +51,7 @@ func (s *Server) Close() error { func Make(ctx context.Context, config *config.Config) (*Server, error) { logger := log.FromContext(ctx) - d, err := db.Make(config.Core.DbPath) + d, err := db.Make(ctx, config.Core.DbPath, log.SubLogger(logger, "db")) if err != nil { return nil, err } -- 2.43.0