Monorepo for Tangled tangled.org

knotserver: pass logger into DB

Signed-off-by: oppiliappan <me@oppi.li>

oppi.li 6ae8074c e007a3cc

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