aljaz/lndhub.go
1
1
Fork 0
mirror of https://github.com/getAlby/lndhub.go.git synced 2025-12-21 06:34:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feature: add db pool config

Browse Source
This commit is contained in:
kiwiidb
2023-02-16 14:46:39 +01:00
parent 7a01bf6d84
commit 4dee1da2ae
4 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
db/db.go
View File

@@ -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)
} }

4
integration_tests/util.go
View File

@@ -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)
} }

65
lib/service/config.go
View File

@@ -6,37 +6,40 @@ import (
) )
type Config struct { type Config struct {
DatabaseUri string `envconfig:"DATABASE_URI" required:"true"` DatabaseUri string `envconfig:"DATABASE_URI" required:"true"`
SentryDSN string `envconfig:"SENTRY_DSN"` DatabaseMaxConns int `envconfig:"DATABASE_MAX_CONNS" default:"10"`
SentryTracesSampleRate float64 `envconfig:"SENTRY_TRACES_SAMPLE_RATE"` DatabaseMaxIdleConns int `envconfig:"DATABASE_MAX_IDLE_CONNS" default:"5"`
LogFilePath string `envconfig:"LOG_FILE_PATH"` DatabaseConnMaxLifetime int `envconfig:"DATABASE_CONN_MAX_LIFETIME" default:"30"`
JWTSecret []byte `envconfig:"JWT_SECRET" required:"true"` SentryDSN string `envconfig:"SENTRY_DSN"`
AdminToken string `envconfig:"ADMIN_TOKEN"` SentryTracesSampleRate float64 `envconfig:"SENTRY_TRACES_SAMPLE_RATE"`
JWTRefreshTokenExpiry int `envconfig:"JWT_REFRESH_EXPIRY" default:"604800"` // in seconds, default 7 days LogFilePath string `envconfig:"LOG_FILE_PATH"`
JWTAccessTokenExpiry int `envconfig:"JWT_ACCESS_EXPIRY" default:"172800"` // in seconds, default 2 days JWTSecret []byte `envconfig:"JWT_SECRET" required:"true"`
LNDAddress string `envconfig:"LND_ADDRESS" required:"true"` AdminToken string `envconfig:"ADMIN_TOKEN"`
LNDMacaroonFile string `envconfig:"LND_MACAROON_FILE"` JWTRefreshTokenExpiry int `envconfig:"JWT_REFRESH_EXPIRY" default:"604800"` // in seconds, default 7 days
LNDCertFile string `envconfig:"LND_CERT_FILE"` JWTAccessTokenExpiry int `envconfig:"JWT_ACCESS_EXPIRY" default:"172800"` // in seconds, default 2 days
LNDMacaroonHex string `envconfig:"LND_MACAROON_HEX"` LNDAddress string `envconfig:"LND_ADDRESS" required:"true"`
LNDCertHex string `envconfig:"LND_CERT_HEX"` LNDMacaroonFile string `envconfig:"LND_MACAROON_FILE"`
CustomName string `envconfig:"CUSTOM_NAME"` LNDCertFile string `envconfig:"LND_CERT_FILE"`
Host string `envconfig:"HOST" default:"localhost:3000"` LNDMacaroonHex string `envconfig:"LND_MACAROON_HEX"`
Port int `envconfig:"PORT" default:"3000"` LNDCertHex string `envconfig:"LND_CERT_HEX"`
EnableGRPC bool `envconfig:"ENABLE_GRPC" default:"false"` CustomName string `envconfig:"CUSTOM_NAME"`
GRPCPort int `envconfig:"GRPC_PORT" default:"10009"` Host string `envconfig:"HOST" default:"localhost:3000"`
DefaultRateLimit int `envconfig:"DEFAULT_RATE_LIMIT" default:"10"` Port int `envconfig:"PORT" default:"3000"`
StrictRateLimit int `envconfig:"STRICT_RATE_LIMIT" default:"10"` EnableGRPC bool `envconfig:"ENABLE_GRPC" default:"false"`
BurstRateLimit int `envconfig:"BURST_RATE_LIMIT" default:"1"` GRPCPort int `envconfig:"GRPC_PORT" default:"10009"`
EnablePrometheus bool `envconfig:"ENABLE_PROMETHEUS" default:"false"` DefaultRateLimit int `envconfig:"DEFAULT_RATE_LIMIT" default:"10"`
PrometheusPort int `envconfig:"PROMETHEUS_PORT" default:"9092"` StrictRateLimit int `envconfig:"STRICT_RATE_LIMIT" default:"10"`
WebhookUrl string `envconfig:"WEBHOOK_URL"` BurstRateLimit int `envconfig:"BURST_RATE_LIMIT" default:"1"`
FeeReserve bool `envconfig:"FEE_RESERVE" default:"false"` EnablePrometheus bool `envconfig:"ENABLE_PROMETHEUS" default:"false"`
AllowAccountCreation bool `envconfig:"ALLOW_ACCOUNT_CREATION" default:"true"` PrometheusPort int `envconfig:"PROMETHEUS_PORT" default:"9092"`
MinPasswordEntropy int `envconfig:"MIN_PASSWORD_ENTROPY" default:"0"` WebhookUrl string `envconfig:"WEBHOOK_URL"`
MaxReceiveAmount int64 `envconfig:"MAX_RECEIVE_AMOUNT" default:"0"` FeeReserve bool `envconfig:"FEE_RESERVE" default:"false"`
MaxSendAmount int64 `envconfig:"MAX_SEND_AMOUNT" default:"0"` AllowAccountCreation bool `envconfig:"ALLOW_ACCOUNT_CREATION" default:"true"`
MaxAccountBalance int64 `envconfig:"MAX_ACCOUNT_BALANCE" default:"0"` MinPasswordEntropy int `envconfig:"MIN_PASSWORD_ENTROPY" default:"0"`
Branding BrandingConfig MaxReceiveAmount int64 `envconfig:"MAX_RECEIVE_AMOUNT" default:"0"`
MaxSendAmount int64 `envconfig:"MAX_SEND_AMOUNT" default:"0"`
MaxAccountBalance int64 `envconfig:"MAX_ACCOUNT_BALANCE" default:"0"`
Branding BrandingConfig
} }
type BrandingConfig struct { type BrandingConfig struct {

2
main.go
View File

@@ -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)
} }