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

multi: fix recovering from bad connection.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2015-11-14 14:44:16 +02:00
parent 470271c81e
commit ade3425870
12 changed files with 108 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
redis.go
View File

@ -16,20 +16,16 @@ func (c *baseClient) String() string {
return fmt.Sprintf("Redis<%s db:%d>", c.opt.Addr, c.opt.DB)
}
func (c *baseClient) conn() (*conn, error) {
func (c *baseClient) conn() (*conn, bool, error) {
return c.connPool.Get()
}
func (c *baseClient) putConn(cn *conn, ei error) {
var err error
if cn.rd.Buffered() > 0 {
if isBadConn(cn, ei) {
err = c.connPool.Remove(cn)
} else if ei == nil {
err = c.connPool.Put(cn)
} else if _, ok := ei.(redisError); ok {
err = c.connPool.Put(cn)
} else {
err = c.connPool.Remove(cn)
err = c.connPool.Put(cn)
}
if err != nil {
log.Printf("redis: putConn failed: %s", err)
@ -42,7 +38,7 @@ func (c *baseClient) process(cmd Cmder) {
cmd.reset()
}
cn, err := c.conn()
cn, _, err := c.conn()
if err != nil {
cmd.setErr(err)
return