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

Close connection on network timeout.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2016-03-08 17:18:52 +02:00
parent 0ea1bdd306
commit 673e999431
8 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
redis.go
View File

@ -23,8 +23,8 @@ func (c *baseClient) conn() (*conn, bool, error) {
return c.connPool.Get()
}
func (c *baseClient) putConn(cn *conn, err error) bool {
if isBadConn(err) {
func (c *baseClient) putConn(cn *conn, err error, allowTimeout bool) bool {
if isBadConn(err, allowTimeout) {
err = c.connPool.Remove(cn, err)
if err != nil {
Logger.Printf("pool.Remove failed: %s", err)
@ -51,20 +51,16 @@ func (c *baseClient) process(cmd Cmder) {
return
}
if timeout := cmd.writeTimeout(); timeout != nil {
cn.WriteTimeout = *timeout
} else {
cn.WriteTimeout = c.opt.WriteTimeout
}
if timeout := cmd.readTimeout(); timeout != nil {
cn.ReadTimeout = *timeout
readTimeout := cmd.readTimeout()
if readTimeout != nil {
cn.ReadTimeout = *readTimeout
} else {
cn.ReadTimeout = c.opt.ReadTimeout
}
cn.WriteTimeout = c.opt.WriteTimeout
if err := cn.writeCmds(cmd); err != nil {
c.putConn(cn, err)
c.putConn(cn, err, false)
cmd.setErr(err)
if shouldRetry(err) {
continue
@ -73,7 +69,7 @@ func (c *baseClient) process(cmd Cmder) {
}
err = cmd.readReply(cn)
c.putConn(cn, err)
c.putConn(cn, err, readTimeout != nil)
if shouldRetry(err) {
continue
}