mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #511 from go-redis/fix/simple-ping 

Use simple PING for compatibility
This commit is contained in:
Vladimir Mihailenco 2017-02-23 16:37:17 +03:00 committed by GitHub
parent 6dfa30adb8 58e9c55d8e
commit fe9d145e7c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pubsub.go
View File

@ -98,10 +98,10 @@ func (c *PubSub) Close() error {
return c.base.Close() return c.base.Close()
} }
func (c *PubSub) Ping(payload string) error { func (c *PubSub) Ping(payload ...string) error {
args := []interface{}{"PING"} args := []interface{}{"PING"}
if payload != "" { if len(payload) == 1 {
args = append(args, payload) args = append(args, payload[0])
} }
cmd := NewCmd(args...) cmd := NewCmd(args...)
@ -239,7 +239,7 @@ func (c *PubSub) receiveMessage(timeout time.Duration) (*Message, error) {
errNum++ errNum++
if errNum < 3 { if errNum < 3 {
if netErr, ok := err.(net.Error); ok && netErr.Timeout() { if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
err := c.Ping("hello") err := c.Ping()
if err != nil { if err != nil {
internal.Logf("PubSub.Ping failed: %s", err) internal.Logf("PubSub.Ping failed: %s", err)
} }