redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-08-08 23:42:06 +03:00
Code Activity

Move some tests to pool package.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2016-03-17 13:48:04 +02:00
parent 998148be40
commit 93a7fe0de3
5 changed files with 173 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/pool/pool.go
View File

@@ -12,7 +12,7 @@ import (
"gopkg.in/bsm/ratelimit.v1"
)
var Logger = log.New(os.Stderr, "pg: ", log.LstdFlags)
var Logger = log.New(os.Stderr, "redis: ", log.LstdFlags)
var (
ErrClosed = errors.New("redis: client is closed")
@@ -108,9 +108,9 @@ func (p *ConnPool) First() *Conn {
}
// wait waits for free non-idle connection. It returns nil on timeout.
func (p *ConnPool) wait() *Conn {
func (p *ConnPool) wait(timeout time.Duration) *Conn {
for {
cn := p.freeConns.PopWithTimeout(p.poolTimeout)
cn := p.freeConns.PopWithTimeout(timeout)
if cn != nil && cn.IsStale(p.idleTimeout) {
var err error
cn, err = p.replace(cn)
@@ -175,7 +175,7 @@ func (p *ConnPool) Get() (*Conn, error) {
// Otherwise, wait for the available connection.
atomic.AddUint32(&p.stats.Waits, 1)
if cn := p.wait(); cn != nil {
if cn := p.wait(p.poolTimeout); cn != nil {
return cn, nil
}
@@ -270,8 +270,8 @@ func (p *ConnPool) Close() (retErr error) {
}
// Wait for app to free connections, but don't close them immediately.
for i := 0; i < p.Len(); i++ {
if cn := p.wait(); cn == nil {
for i := 0; i < p.Len()-p.FreeLen(); i++ {
if cn := p.wait(3 * time.Second); cn == nil {
break
}
}