redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-29 17:41:15 +03:00
Code Activity

PubSub conns don't share connection pool limit

Browse Source
This commit is contained in:
Vladimir Mihailenco
2017-04-17 15:43:58 +03:00
parent aeb22d6a37
commit 6499563e07
14 changed files with 180 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sentinel.go
View File

@ -2,7 +2,6 @@ package redis
import (
"errors"
"fmt"
"net"
"strings"
"sync"
@ -111,7 +110,7 @@ func (c *sentinelClient) PubSub() *PubSub {
return &PubSub{
base: baseClient{
opt: c.opt,
connPool: pool.NewStickyConnPool(c.connPool.(*pool.ConnPool), false),
connPool: c.connPool,
},
}
}
@ -268,12 +267,11 @@ func (d *sentinelFailover) closeOldConns(newMaster string) {
break
}
if cn.RemoteAddr().String() != newMaster {
err := fmt.Errorf(
internal.Logf(
"sentinel: closing connection to the old master %s",
cn.RemoteAddr(),
)
internal.Logf(err.Error())
d.pool.Remove(cn, err)
d.pool.Remove(cn)
} else {
cnsToPut = append(cnsToPut, cn)
}