Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[-] fix connection string used for resolved databases, fixes #554 #559

Merged
merged 1 commit into from
Oct 14, 2024
Merged

[-] fix connection string used for resolved databases, fixes #554 #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions internal/db/bootstrap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ func New(ctx context.Context, connStr string, callbacks ...ConnConfigCallback) (
if err != nil {
return nil, err
}
return NewWithConfig(ctx, connConfig, callbacks...)
}

// NewWithConfig creates a new pool with a given config
func NewWithConfig(ctx context.Context, connConfig *pgxpool.Config, callbacks ...ConnConfigCallback) (PgxPoolIface, error) {
logger := log.GetLogger(ctx)
if connConfig.ConnConfig.ConnectTimeout == 0 {
connConfig.ConnConfig.ConnectTimeout = time.Second * 5
Expand All @@ -45,11 +50,11 @@ func New(ctx context.Context, connStr string, callbacks ...ConnConfigCallback) (
}
tracelogger := &tracelog.TraceLog{
Logger: log.NewPgxLogger(logger),
LogLevel: tracelog.LogLevelDebug, //map[bool]tracelog.LogLevel{false: tracelog.LogLevelWarn, true: tracelog.LogLevelDebug}[true],
LogLevel: tracelog.LogLevelDebug,
}
connConfig.ConnConfig.Tracer = tracelogger
for _, f := range callbacks {
if err = f(connConfig); err != nil {
if err := f(connConfig); err != nil {
return nil, err
}
}
Expand Down
24 changes: 15 additions & 9 deletions internal/sources/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ import (
"slices"

"github.com/cybertec-postgresql/pgwatch/v3/internal/db"
pgx "github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgxpool"
)

type Kind string
Expand Down Expand Up @@ -86,7 +87,7 @@ type (
MonitoredDatabase struct {
Source
Conn db.PgxPoolIface
ConnConfig *pgx.ConnConfig
ConnConfig *pgxpool.Config
}

MonitoredDatabases []*MonitoredDatabase
Expand All @@ -106,7 +107,12 @@ func (md *MonitoredDatabase) Ping(ctx context.Context) error {
// If the connection is already established, it pings the server to ensure it's still alive.
func (md *MonitoredDatabase) Connect(ctx context.Context) (err error) {
if md.Conn == nil {
if md.Conn, err = db.New(ctx, md.ConnStr); err != nil {
if md.ConnConfig != nil {
md.Conn, err = db.NewWithConfig(ctx, md.ConnConfig)
} else {
md.Conn, err = db.New(ctx, md.ConnStr)
}
if err != nil {
return err
}
}
Expand All @@ -117,23 +123,23 @@ func (md *MonitoredDatabase) Connect(ctx context.Context) (err error) {
func (md *MonitoredDatabase) GetDatabaseName() string {
var err error
if md.ConnConfig == nil {
if md.ConnConfig, err = pgx.ParseConfig(md.ConnStr); err != nil {
if md.ConnConfig, err = pgxpool.ParseConfig(md.ConnStr); err != nil {
return ""
}
}
return md.ConnConfig.Database
return md.ConnConfig.ConnConfig.Database
}

// SetDatabaseName sets the database name in the connection config but
// does not update the connection string
// SetDatabaseName sets the database name in the connection config for resolved databases
func (md *MonitoredDatabase) SetDatabaseName(name string) {
var err error
if md.ConnConfig == nil {
if md.ConnConfig, err = pgx.ParseConfig(md.ConnStr); err != nil {
if md.ConnConfig, err = pgxpool.ParseConfig(md.ConnStr); err != nil {
return
}
}
md.ConnConfig.Database = name
md.ConnStr = "" // unset the connection string to force conn config usage
md.ConnConfig.ConnConfig.Database = name
}

func (md *MonitoredDatabase) IsPostgresSource() bool {
Expand Down
Loading