mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge 550b25c20e into e63669e170

This commit is contained in:
Kent Wang 2024-11-22 00:17:39 -05:00 committed by GitHub
parent e63669e170 550b25c20e
commit 9c495669df
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/pool/pool.go
View File

@ -68,6 +68,7 @@ type Options struct {
MaxActiveConns int MaxActiveConns int
ConnMaxIdleTime time.Duration ConnMaxIdleTime time.Duration
ConnMaxLifetime time.Duration ConnMaxLifetime time.Duration
ConnChecker func(net.Conn) error
} }
type lastDialErrorWrap struct { type lastDialErrorWrap struct {
@ -513,6 +514,12 @@ func (p *ConnPool) isHealthyConn(cn *Conn) bool {
return false return false
} }
if p.cfg.ConnChecker != nil {
if err := p.cfg.ConnChecker(cn.netConn); err != nil {
return false
}
}
cn.SetUsedAt(now) cn.SetUsedAt(now)
return true return true
} }

4
options.go
View File

@ -139,6 +139,9 @@ type Options struct {
// Default is to not close idle connections. // Default is to not close idle connections.
ConnMaxLifetime time.Duration ConnMaxLifetime time.Duration
// ConnChecker checks the health of a connection before returning it to the client.
ConnChecker func(net.Conn) error
// TLS Config to use. When set, TLS will be negotiated. // TLS Config to use. When set, TLS will be negotiated.
TLSConfig *tls.Config TLSConfig *tls.Config
@ -523,5 +526,6 @@ func newConnPool(
MaxActiveConns: opt.MaxActiveConns, MaxActiveConns: opt.MaxActiveConns,
ConnMaxIdleTime: opt.ConnMaxIdleTime, ConnMaxIdleTime: opt.ConnMaxIdleTime,
ConnMaxLifetime: opt.ConnMaxLifetime, ConnMaxLifetime: opt.ConnMaxLifetime,
ConnChecker: opt.ConnChecker,
}) })
} }