From 48947934df7453ef1876b21f9db2e485cb4c4ae9 Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Wed, 10 Dec 2025 03:27:35 +0000 Subject: [PATCH] knotserver: pass logger into DB Change-Id: pxykyvlpmvywwswmvyxlwtvzrkooqozy Signed-off-by: oppiliappan --- knotserver/db/db.go | 16 +++++++++++++--- knotserver/server.go | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/knotserver/db/db.go b/knotserver/db/db.go index 302f6fc3..9783848b 100644 --- a/knotserver/db/db.go +++ b/knotserver/db/db.go @@ -1,17 +1,21 @@ package db import ( + "context" "database/sql" + "log/slog" "strings" _ "github.com/mattn/go-sqlite3" + "tangled.org/core/log" ) type DB struct { - db *sql.DB + db *sql.DB + logger *slog.Logger } -func Setup(dbPath string) (*DB, error) { +func Setup(ctx context.Context, dbPath string) (*DB, error) { // https://github.com/mattn/go-sqlite3#connection-string opts := []string{ "_foreign_keys=1", @@ -20,6 +24,9 @@ func Setup(dbPath string) (*DB, error) { "_auto_vacuum=incremental", } + logger := log.FromContext(ctx) + logger = log.SubLogger(logger, "db") + db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) if err != nil { return nil, err @@ -60,5 +67,8 @@ func Setup(dbPath string) (*DB, error) { return nil, err } - return &DB{db: db}, nil + return &DB{ + db: db, + logger: logger, + }, nil } diff --git a/knotserver/server.go b/knotserver/server.go index 9d90b7f4..2a654cfd 100644 --- a/knotserver/server.go +++ b/knotserver/server.go @@ -64,7 +64,7 @@ func Run(ctx context.Context, cmd *cli.Command) error { logger.Info("running in dev mode, signature verification is disabled") } - db, err := db.Setup(c.Server.DBPath) + db, err := db.Setup(ctx, c.Server.DBPath) if err != nil { return fmt.Errorf("failed to load db: %w", err) } -- 2.43.0