mirror of
https://github.com/jackc/pgx.git
synced 2025-07-11 04:58:20 +00:00
Failsafe timeout for background pool connections
Do not override existing connect timeout.
This commit is contained in:
parent
7c6a31f9d2
commit
c842802d65
@ -208,14 +208,14 @@ func NewWithConfig(ctx context.Context, config *Config) (*Pool, error) {
|
||||
// see https://github.com/jackc/pgx/issues/1259
|
||||
ctx = detachedCtx{ctx}
|
||||
|
||||
// But we do want to ensure that a connect won't hang forever.
|
||||
ctx, cancel := context.WithTimeout(ctx, 2*time.Minute)
|
||||
defer cancel()
|
||||
connConfig := p.config.ConnConfig.Copy()
|
||||
|
||||
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 {
|
||||
connConfig = p.config.ConnConfig.Copy()
|
||||
if err := p.beforeConnect(ctx, connConfig); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user