diff --git a/cmd/twhelp/bun.go b/cmd/twhelp/bun.go index 2bd213f..5f06cdf 100644 --- a/cmd/twhelp/bun.go +++ b/cmd/twhelp/bun.go @@ -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) diff --git a/cmd/twhelp/cmd_consumer.go b/cmd/twhelp/cmd_consumer.go index f29984f..25a207b 100644 --- a/cmd/twhelp/cmd_consumer.go +++ b/cmd/twhelp/cmd_consumer.go @@ -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 } diff --git a/cmd/twhelp/cmd_db.go b/cmd/twhelp/cmd_db.go index a81c13f..37add33 100644 --- a/cmd/twhelp/cmd_db.go +++ b/cmd/twhelp/cmd_db.go @@ -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 } diff --git a/cmd/twhelp/cmd_job.go b/cmd/twhelp/cmd_job.go index db51721..2f451ab 100644 --- a/cmd/twhelp/cmd_job.go +++ b/cmd/twhelp/cmd_job.go @@ -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 } diff --git a/cmd/twhelp/cmd_serve.go b/cmd/twhelp/cmd_serve.go index fc860f6..01256af 100644 --- a/cmd/twhelp/cmd_serve.go +++ b/cmd/twhelp/cmd_serve.go @@ -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 }