re
/
redis
forked from mirror/redis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix names

This commit is contained in:
Vladimir Mihailenco 2019-08-07 16:12:01 +03:00
parent 742f3ccb21
commit 27f3b27893
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/pool/pool.go
View File

@ -121,7 +121,7 @@ func (p *ConnPool) checkMinIdleConns() {
} }
func (p *ConnPool) addIdleConn() error { func (p *ConnPool) addIdleConn() error {
cn, err := p.newConn(context.TODO(), true) cn, err := p.dialConn(context.TODO(), true)
if err != nil { if err != nil {
return err return err
} }
@ -134,11 +134,11 @@ func (p *ConnPool) addIdleConn() error {
} }
func (p *ConnPool) NewConn(ctx context.Context) (*Conn, error) { func (p *ConnPool) NewConn(ctx context.Context) (*Conn, error) {
return p._NewConn(ctx, false) return p.newConn(ctx, false)
} }
func (p *ConnPool) _NewConn(ctx context.Context, pooled bool) (*Conn, error) { func (p *ConnPool) newConn(ctx context.Context, pooled bool) (*Conn, error) {
cn, err := p.newConn(ctx, pooled) cn, err := p.dialConn(ctx, pooled)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -157,7 +157,7 @@ func (p *ConnPool) _NewConn(ctx context.Context, pooled bool) (*Conn, error) {
return cn, nil return cn, nil
} }
func (p *ConnPool) newConn(ctx context.Context, pooled bool) (*Conn, error) { func (p *ConnPool) dialConn(ctx context.Context, pooled bool) (*Conn, error) {
if p.closed() { if p.closed() {
return nil, ErrClosed return nil, ErrClosed
} }
@ -243,7 +243,7 @@ func (p *ConnPool) Get(ctx context.Context) (*Conn, error) {
atomic.AddUint32(&p.stats.Misses, 1) atomic.AddUint32(&p.stats.Misses, 1)
newcn, err := p._NewConn(ctx, true) newcn, err := p.newConn(ctx, true)
if err != nil { if err != nil {
p.freeTurn() p.freeTurn()
return nil, err return nil, err