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

Fix connection initialization.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2016-03-15 14:04:35 +02:00
parent 7f594cdbe1
commit 707472c09b
17 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
redis.go
View File

@ -32,15 +32,18 @@ func (c *baseClient) String() string {
return fmt.Sprintf("Redis<%s db:%d>", c.opt.Addr, c.opt.DB)
}
func (c *baseClient) conn() (*pool.Conn, bool, error) {
cn, isNew, err := c.connPool.Get()
if err == nil && isNew {
err = c.initConn(cn)
if err != nil {
c.putConn(cn, err, false)
func (c *baseClient) conn() (*pool.Conn, error) {
cn, err := c.connPool.Get()
if err != nil {
return nil, err
}
if !cn.Inited {
if err := c.initConn(cn); err != nil {
_ = c.connPool.Replace(cn, err)
return nil, err
}
}
return cn, isNew, err
return cn, err
}
func (c *baseClient) putConn(cn *pool.Conn, err error, allowTimeout bool) bool {
@ -54,6 +57,8 @@ func (c *baseClient) putConn(cn *pool.Conn, err error, allowTimeout bool) bool {
}
func (c *baseClient) initConn(cn *pool.Conn) error {
cn.Inited = true
if c.opt.Password == "" && c.opt.DB == 0 {
return nil
}
@ -82,7 +87,7 @@ func (c *baseClient) process(cmd Cmder) {
cmd.reset()
}
cn, _, err := c.conn()
cn, err := c.conn()
if err != nil {
cmd.setErr(err)
return