Merge pull request redis#551 from go-redis/fix/init-pubsub

Initialize PubSub connection
apprentice3d · Apr 18, 2017 · 15786cf · 15786cf
2 parents 4fdc3bb + 7646d48
commit 15786cf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pubsub.go b/pubsub.go
@@ -78,8 +78,15 @@ func (c *PubSub) _conn() (*pool.Conn, bool, error) {
 	if err != nil {
 		return nil, false, err
 	}
-	c.cn = cn
 
+	if !cn.Inited {
+		if err := c.base.initConn(cn); err != nil {
+			_ = c.base.connPool.Remove(cn)
+			return nil, false, err
+		}
+	}
+
+	c.cn = cn
 	return cn, true, nil
 }
 

diff --git a/redis.go b/redis.go
@@ -38,6 +38,7 @@ func (c *baseClient) conn() (*pool.Conn, bool, error) {
 			return nil, false, err
 		}
 	}
+
 	return cn, isNew, nil
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,6 +38,7 @@ func (c *baseClient) conn() (*pool.Conn, bool, error) { @@
     			return nil, false, err
     		}
     	}
     	return cn, isNew, nil
     }
@@ Expand Down @@