twhelp/core
1
0
Fork 0
Code Issues 1 Pull Requests 3 Packages Projects Releases 7 Wiki Activity

feat: postgres - set application name
All checks were successful
ci/woodpecker/push/govulncheck Pipeline was successful
Details
ci/woodpecker/push/test Pipeline was successful
Details
ci/woodpecker/tag/release Pipeline was successful
Details
ci/woodpecker/tag/deployment Pipeline was successful
Details
ci/woodpecker/cron/govulncheck Pipeline was successful
Details

Browse Source
This commit is contained in:
Dawid Wysokiński 2024-05-11 17:30:06 +02:00
parent 7de443c652
commit 6e2c54679e
Signed by: Kichiyaki
GPG Key ID: B5445E357FB8B892
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/twhelp/bun.go
View File

@ -59,8 +59,9 @@ var (
}
)
func newBunDBFromFlags(c *cli.Context) (*bun.DB, error) {
func newBunDBFromFlags(c *cli.Context, applicationName string) (*bun.DB, error) {
return newBunDB(bundDBConfig{
applicationName: applicationName,
connectionString: c.String(dbFlagConnectionString.Name),
maxOpenConns: c.Int(dbFlagMaxOpenConns.Name),
maxIdleConns: c.Int(dbFlagMaxIdleConns.Name),
@ -72,6 +73,7 @@ func newBunDBFromFlags(c *cli.Context) (*bun.DB, error) {
type bundDBConfig struct {
connectionString string
applicationName string
maxOpenConns int
maxIdleConns int
connMaxLifetime time.Duration
@ -99,6 +101,7 @@ func newSQLDB(cfg bundDBConfig) *sql.DB {
pgdriver.WithDSN(cfg.connectionString),
pgdriver.WithReadTimeout(cfg.readTimeout),
pgdriver.WithWriteTimeout(cfg.writeTimeout),
pgdriver.WithApplicationName(cfg.applicationName),
))
db.SetMaxOpenConns(cfg.maxOpenConns)
db.SetMaxIdleConns(cfg.maxIdleConns)

3
cmd/twhelp/cmd_consumer.go
View File

@ -18,6 +18,7 @@ import (
"github.com/ThreeDotsLabs/watermill-amqp/v2/pkg/amqp"
"github.com/ThreeDotsLabs/watermill/message"
"github.com/ThreeDotsLabs/watermill/message/router/middleware"
"github.com/ettle/strcase"
"github.com/uptrace/bun"
"github.com/urfave/cli/v2"
)
@ -346,7 +347,7 @@ func runConsumer(c *cli.Context, name string, registerHandlers registerConsumerH
}
}()
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, strcase.ToSnake(name))
if err != nil {
return err
}

4
cmd/twhelp/cmd_db.go
View File

@ -45,7 +45,7 @@ var cmdDB = &cli.Command{
logger := loggerFromCtx(c.Context)
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, "migrations")
if err != nil {
return err
}
@ -94,7 +94,7 @@ var cmdDB = &cli.Command{
logger := loggerFromCtx(c.Context)
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, "migrations")
if err != nil {
return err
}

8
cmd/twhelp/cmd_job.go
View File

@ -47,7 +47,7 @@ var (
}
}()
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, "data_sync_job")
if err != nil {
return err
}
@ -103,7 +103,7 @@ var (
}
}()
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, "ennoblement_sync_job")
if err != nil {
return err
}
@ -165,7 +165,7 @@ var (
}
}()
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, "snapshot_creation_job")
if err != nil {
return err
}
@ -242,7 +242,7 @@ var (
}
}()
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, "cleanup_job")
if err != nil {
return err
}

2
cmd/twhelp/cmd_serve.go
View File

@ -99,7 +99,7 @@ var cmdServe = &cli.Command{
logger := loggerFromCtx(c.Context)
// deps
bunDB, err := newBunDBFromFlags(c)
bunDB, err := newBunDBFromFlags(c, "api")
if err != nil {
return err
}