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
pubsub.go
View File

@ -47,7 +47,7 @@ func (c *Client) PSubscribe(channels ...string) (*PubSub, error) {
}
func (c *PubSub) subscribe(cmd string, channels ...string) error {
cn, err := c.conn()
cn, _, err := c.conn()
if err != nil {
return err
}
@ -112,7 +112,7 @@ func (c *PubSub) PUnsubscribe(patterns ...string) error {
}
func (c *PubSub) Ping(payload string) error {
cn, err := c.conn()
cn, _, err := c.conn()
if err != nil {
return err
}
@ -208,14 +208,16 @@ func newMessage(reply []interface{}) (interface{}, error) {
// is not received in time. This is low-level API and most clients
// should use ReceiveMessage.
func (c *PubSub) ReceiveTimeout(timeout time.Duration) (interface{}, error) {
cn, err := c.conn()
cn, _, err := c.conn()
if err != nil {
return nil, err
}
cn.ReadTimeout = timeout
cmd := NewSliceCmd()
if err := cmd.readReply(cn); err != nil {
err = cmd.readReply(cn)
c.putConn(cn, err)
if err != nil {
return nil, err
}
return newMessage(cmd.Val())
@ -229,7 +231,7 @@ func (c *PubSub) Receive() (interface{}, error) {
}
func (c *PubSub) reconnect() {
c.connPool.Remove(nil) // close current connection
c.connPool.Remove(nil) // nil to force removal
if len(c.channels) > 0 {
if err := c.Subscribe(c.channels...); err != nil {
log.Printf("redis: Subscribe failed: %s", err)