back round 0 view raw

feat(db): use slogger #7

merged

opened by

brookjeynes.dev 2 months ago targeting master from push-trrpxxyxxmot

Signed-off-by: brookjeynes me@brookjeynes.dev

options

unified split

Changed files

+8 -5

internal

db.go

server

app.go

+7 -4

internal/db/db.go

···

       4
        
       	"context"

     

       5
        
       	"database/sql"

     

       6
        
       	"fmt"

     

       0
        
       
     

       7
        
       	"strings"

     

       8
        
       

     

       9
        
       	_ "github.com/mattn/go-sqlite3"

     
···

       11
        
       

     

       12
        
       type DB struct {

     

       13
        
       	*sql.DB

     

       0
        
       
     

       14
        
       }

     

       15
        
       

     

       16
        
       type Execer interface {

     
···

       24
        
       	PrepareContext(ctx context.Context, query string) (*sql.Stmt, error)

     

       25
        
       }

     

       26
        
       

     

       27
       -
       func Make(dbPath string) (*DB, error) {

     

       28
        
       	opts := []string{

     

       29
        
       		"_foreign_keys=1",

     

       30
        
       		"_journal_mode=WAL",

     
···

       37
        
       		return nil, fmt.Errorf("failed to open db: %w", err)

     

       38
        
       	}

     

       39
        
       

     

       40
       -
       	ctx := context.Background()

     

       41
       -
       

     

       42
        
       	conn, err := db.Conn(ctx)

     

       43
        
       	if err != nil {

     

       44
        
       		return nil, err

     
···

       231
        
       		return nil, fmt.Errorf("failed to execute db create statement: %w", err)

     

       232
        
       	}

     

       233
        
       

     

       234
       -
       	return &DB{db}, nil

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       235
        
       }

···

       4
        
       	"context"

     

       5
        
       	"database/sql"

     

       6
        
       	"fmt"

     

       7
       +
       	"log/slog"

     

       8
        
       	"strings"

     

       9
        
       

     

       10
        
       	_ "github.com/mattn/go-sqlite3"

     
···

       12
        
       

     

       13
        
       type DB struct {

     

       14
        
       	*sql.DB

     

       15
       +
       	logger *slog.Logger

     

       16
        
       }

     

       17
        
       

     

       18
        
       type Execer interface {

     
···

       26
        
       	PrepareContext(ctx context.Context, query string) (*sql.Stmt, error)

     

       27
        
       }

     

       28
        
       

     

       29
       +
       func Make(ctx context.Context, dbPath string, logger *slog.Logger) (*DB, error) {

     

       30
        
       	opts := []string{

     

       31
        
       		"_foreign_keys=1",

     

       32
        
       		"_journal_mode=WAL",

     
···

       39
        
       		return nil, fmt.Errorf("failed to open db: %w", err)

     

       40
        
       	}

     

       41
        
       

     

       0
        
       
     

       0
        
       
     

       42
        
       	conn, err := db.Conn(ctx)

     

       43
        
       	if err != nil {

     

       44
        
       		return nil, err

     
···

       231
        
       		return nil, fmt.Errorf("failed to execute db create statement: %w", err)

     

       232
        
       	}

     

       233
        
       

     

       234
       +
       	return &DB{

     

       235
       +
       		db,

     

       236
       +
       		logger,

     

       237
       +
       	}, nil

     

       238
        
       }

+1 -1

internal/server/app.go

···

       51
        
       func Make(ctx context.Context, config *config.Config) (*Server, error) {

     

       52
        
       	logger := log.FromContext(ctx)

     

       53
        
       

     

       54
       -
       	d, err := db.Make(config.Core.DbPath)

     

       55
        
       	if err != nil {

     

       56
        
       		return nil, err

     

       57
        
       	}

···

       51
        
       func Make(ctx context.Context, config *config.Config) (*Server, error) {

     

       52
        
       	logger := log.FromContext(ctx)

     

       53
        
       

     

       54
       +
       	d, err := db.Make(ctx, config.Core.DbPath, log.SubLogger(logger, "db"))

     

       55
        
       	if err != nil {

     

       56
        
       		return nil, err

     

       57
        
       	}