gopkg/pgx
2
0
Fork 0
Code Activity

Failsafe timeout for background pool connections

Browse Source 
Do not override existing connect timeout.
This commit is contained in:
Jack Christensen
2022-08-13 09:49:06 -05:00
parent 7c6a31f9d2
commit c842802d65
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pgxpool/pool.go
+5 -5
View File
@@ -208,14 +208,14 @@ func NewWithConfig(ctx context.Context, config *Config) (*Pool, error) {
// see https://github.com/jackc/pgx/issues/1259 // see https://github.com/jackc/pgx/issues/1259
ctx = detachedCtx{ctx} ctx = detachedCtx{ctx}
// But we do want to ensure that a connect won't hang forever. connConfig := p.config.ConnConfig.Copy()
ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
defer cancel()
connConfig := p.config.ConnConfig // But we do want to ensure that a connect won't hang forever.
if connConfig.ConnectTimeout <= 0 {
connConfig.ConnectTimeout = 2 * time.Minute
}
if p.beforeConnect != nil { if p.beforeConnect != nil {
connConfig = p.config.ConnConfig.Copy()
if err := p.beforeConnect(ctx, connConfig); err != nil { if err := p.beforeConnect(ctx, connConfig); err != nil {
return nil, err return nil, err
} }