mirror of
https://github.com/getAlby/lndhub.go.git
synced 2025-12-21 06:34:58 +01:00
feature: add db pool config
This commit is contained in:
8
db/db.go
8
db/db.go
@@ -4,19 +4,25 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/getAlby/lndhub.go/lib/service"
|
||||||
"github.com/uptrace/bun"
|
"github.com/uptrace/bun"
|
||||||
"github.com/uptrace/bun/dialect/pgdialect"
|
"github.com/uptrace/bun/dialect/pgdialect"
|
||||||
"github.com/uptrace/bun/driver/pgdriver"
|
"github.com/uptrace/bun/driver/pgdriver"
|
||||||
"github.com/uptrace/bun/extra/bundebug"
|
"github.com/uptrace/bun/extra/bundebug"
|
||||||
)
|
)
|
||||||
|
|
||||||
func Open(dsn string) (*bun.DB, error) {
|
func Open(config *service.Config) (*bun.DB, error) {
|
||||||
var db *bun.DB
|
var db *bun.DB
|
||||||
|
dsn := config.DatabaseUri
|
||||||
switch {
|
switch {
|
||||||
case strings.HasPrefix(dsn, "postgres://") || strings.HasPrefix(dsn, "postgresql://") || strings.HasPrefix(dsn, "unix://"):
|
case strings.HasPrefix(dsn, "postgres://") || strings.HasPrefix(dsn, "postgresql://") || strings.HasPrefix(dsn, "unix://"):
|
||||||
dbConn := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn)))
|
dbConn := sql.OpenDB(pgdriver.NewConnector(pgdriver.WithDSN(dsn)))
|
||||||
db = bun.NewDB(dbConn, pgdialect.New())
|
db = bun.NewDB(dbConn, pgdialect.New())
|
||||||
|
db.SetMaxOpenConns(config.DatabaseMaxConns)
|
||||||
|
db.SetMaxIdleConns(config.DatabaseMaxIdleConns)
|
||||||
|
db.SetConnMaxLifetime(time.Duration(config.DatabaseConnMaxLifetime) * time.Second)
|
||||||
default:
|
default:
|
||||||
return nil, fmt.Errorf("Invalid database connection string %s, only (postgres|postgresql|unix):// is supported", dsn)
|
return nil, fmt.Errorf("Invalid database connection string %s, only (postgres|postgresql|unix):// is supported", dsn)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ func LndHubTestServiceInit(lndClientMock lnd.LightningClientWrapper) (svc *servi
|
|||||||
LNDAddress: mockLNDAddress,
|
LNDAddress: mockLNDAddress,
|
||||||
LNDMacaroonHex: mockLNDMacaroonHex,
|
LNDMacaroonHex: mockLNDMacaroonHex,
|
||||||
}
|
}
|
||||||
dbConn, err := db.Open(c.DatabaseUri)
|
dbConn, err := db.Open(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to connect to database: %w", err)
|
return nil, fmt.Errorf("failed to connect to database: %w", err)
|
||||||
}
|
}
|
||||||
@@ -87,7 +87,7 @@ func LndHubTestServiceInit(lndClientMock lnd.LightningClientWrapper) (svc *servi
|
|||||||
}
|
}
|
||||||
|
|
||||||
func clearTable(svc *service.LndhubService, tableName string) error {
|
func clearTable(svc *service.LndhubService, tableName string) error {
|
||||||
dbConn, err := db.Open(svc.Config.DatabaseUri)
|
dbConn, err := db.Open(svc.Config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to connect to database: %w", err)
|
return fmt.Errorf("failed to connect to database: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,9 @@ import (
|
|||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
DatabaseUri string `envconfig:"DATABASE_URI" required:"true"`
|
DatabaseUri string `envconfig:"DATABASE_URI" required:"true"`
|
||||||
|
DatabaseMaxConns int `envconfig:"DATABASE_MAX_CONNS" default:"10"`
|
||||||
|
DatabaseMaxIdleConns int `envconfig:"DATABASE_MAX_IDLE_CONNS" default:"5"`
|
||||||
|
DatabaseConnMaxLifetime int `envconfig:"DATABASE_CONN_MAX_LIFETIME" default:"30"`
|
||||||
SentryDSN string `envconfig:"SENTRY_DSN"`
|
SentryDSN string `envconfig:"SENTRY_DSN"`
|
||||||
SentryTracesSampleRate float64 `envconfig:"SENTRY_TRACES_SAMPLE_RATE"`
|
SentryTracesSampleRate float64 `envconfig:"SENTRY_TRACES_SAMPLE_RATE"`
|
||||||
LogFilePath string `envconfig:"LOG_FILE_PATH"`
|
LogFilePath string `envconfig:"LOG_FILE_PATH"`
|
||||||
|
|||||||
2
main.go
2
main.go
@@ -78,7 +78,7 @@ func main() {
|
|||||||
logger := lib.Logger(c.LogFilePath)
|
logger := lib.Logger(c.LogFilePath)
|
||||||
|
|
||||||
// Open a DB connection based on the configured DATABASE_URI
|
// Open a DB connection based on the configured DATABASE_URI
|
||||||
dbConn, err := db.Open(c.DatabaseUri)
|
dbConn, err := db.Open(c)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Fatalf("Error initializing db connection: %v", err)
|
logger.Fatalf("Error initializing db connection: %v", err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user