feat: postgres - set application name
All checks were successful
ci/woodpecker/push/govulncheck Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/tag/release Pipeline was successful
ci/woodpecker/tag/deployment Pipeline was successful
ci/woodpecker/cron/govulncheck Pipeline was successful
All checks were successful
ci/woodpecker/push/govulncheck Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/tag/release Pipeline was successful
ci/woodpecker/tag/deployment Pipeline was successful
ci/woodpecker/cron/govulncheck Pipeline was successful
This commit is contained in:
parent
7de443c652
commit
6e2c54679e
|
@ -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{
|
return newBunDB(bundDBConfig{
|
||||||
|
applicationName: applicationName,
|
||||||
connectionString: c.String(dbFlagConnectionString.Name),
|
connectionString: c.String(dbFlagConnectionString.Name),
|
||||||
maxOpenConns: c.Int(dbFlagMaxOpenConns.Name),
|
maxOpenConns: c.Int(dbFlagMaxOpenConns.Name),
|
||||||
maxIdleConns: c.Int(dbFlagMaxIdleConns.Name),
|
maxIdleConns: c.Int(dbFlagMaxIdleConns.Name),
|
||||||
|
@ -72,6 +73,7 @@ func newBunDBFromFlags(c *cli.Context) (*bun.DB, error) {
|
||||||
|
|
||||||
type bundDBConfig struct {
|
type bundDBConfig struct {
|
||||||
connectionString string
|
connectionString string
|
||||||
|
applicationName string
|
||||||
maxOpenConns int
|
maxOpenConns int
|
||||||
maxIdleConns int
|
maxIdleConns int
|
||||||
connMaxLifetime time.Duration
|
connMaxLifetime time.Duration
|
||||||
|
@ -99,6 +101,7 @@ func newSQLDB(cfg bundDBConfig) *sql.DB {
|
||||||
pgdriver.WithDSN(cfg.connectionString),
|
pgdriver.WithDSN(cfg.connectionString),
|
||||||
pgdriver.WithReadTimeout(cfg.readTimeout),
|
pgdriver.WithReadTimeout(cfg.readTimeout),
|
||||||
pgdriver.WithWriteTimeout(cfg.writeTimeout),
|
pgdriver.WithWriteTimeout(cfg.writeTimeout),
|
||||||
|
pgdriver.WithApplicationName(cfg.applicationName),
|
||||||
))
|
))
|
||||||
db.SetMaxOpenConns(cfg.maxOpenConns)
|
db.SetMaxOpenConns(cfg.maxOpenConns)
|
||||||
db.SetMaxIdleConns(cfg.maxIdleConns)
|
db.SetMaxIdleConns(cfg.maxIdleConns)
|
||||||
|
|
|
@ -18,6 +18,7 @@ import (
|
||||||
"github.com/ThreeDotsLabs/watermill-amqp/v2/pkg/amqp"
|
"github.com/ThreeDotsLabs/watermill-amqp/v2/pkg/amqp"
|
||||||
"github.com/ThreeDotsLabs/watermill/message"
|
"github.com/ThreeDotsLabs/watermill/message"
|
||||||
"github.com/ThreeDotsLabs/watermill/message/router/middleware"
|
"github.com/ThreeDotsLabs/watermill/message/router/middleware"
|
||||||
|
"github.com/ettle/strcase"
|
||||||
"github.com/uptrace/bun"
|
"github.com/uptrace/bun"
|
||||||
"github.com/urfave/cli/v2"
|
"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 {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,7 +45,7 @@ var cmdDB = &cli.Command{
|
||||||
|
|
||||||
logger := loggerFromCtx(c.Context)
|
logger := loggerFromCtx(c.Context)
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c, "migrations")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -94,7 +94,7 @@ var cmdDB = &cli.Command{
|
||||||
|
|
||||||
logger := loggerFromCtx(c.Context)
|
logger := loggerFromCtx(c.Context)
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c, "migrations")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,7 +47,7 @@ var (
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c, "data_sync_job")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -103,7 +103,7 @@ var (
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c, "ennoblement_sync_job")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -165,7 +165,7 @@ var (
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c, "snapshot_creation_job")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
@ -242,7 +242,7 @@ var (
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c, "cleanup_job")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ var cmdServe = &cli.Command{
|
||||||
logger := loggerFromCtx(c.Context)
|
logger := loggerFromCtx(c.Context)
|
||||||
|
|
||||||
// deps
|
// deps
|
||||||
bunDB, err := newBunDBFromFlags(c)
|
bunDB, err := newBunDBFromFlags(c, "api")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user