knotserver: pass logger into DB #877

merged
opened by oppi.li targeting master from op/wonqmpyrknoq
Changed files
+9 -4
knotserver
+8 -3
knotserver/db/db.go
··· 2 2 3 3 import ( 4 4 "database/sql" 5 + "log/slog" 5 6 "strings" 6 7 7 8 _ "github.com/mattn/go-sqlite3" 8 9 ) 9 10 10 11 type DB struct { 11 - db *sql.DB 12 + db *sql.DB 13 + logger *slog.Logger 12 14 } 13 15 14 - func Setup(dbPath string) (*DB, error) { 16 + func Setup(dbPath string, logger *slog.Logger) (*DB, error) { 15 17 // https://github.com/mattn/go-sqlite3#connection-string 16 18 opts := []string{ 17 19 "_foreign_keys=1", ··· 60 62 return nil, err 61 63 } 62 64 63 - return &DB{db: db}, nil 65 + return &DB{ 66 + db: db, 67 + logger: logger, 68 + }, nil 64 69 }
+1 -1
knotserver/server.go
··· 64 64 logger.Info("running in dev mode, signature verification is disabled") 65 65 } 66 66 67 - db, err := db.Setup(c.Server.DBPath) 67 + db, err := db.Setup(ctx, c.Server.DBPath) 68 68 if err != nil { 69 69 return fmt.Errorf("failed to load db: %w", err) 70 70 }