have sentinel periodically Ping its master sub connection (might fix m…

…ediocregopher#41)
nickynick · Oct 13, 2016 · ae13dc6 · ae13dc6
1 parent 47958ec
commit ae13dc6
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/sentinel/sentinel.go b/sentinel/sentinel.go
@@ -188,16 +188,25 @@ func NewClientCustom(
 }
 
 func (c *Client) subSpin() {
+	alwaysErr := func(err error) {
+		select {
+		case c.alwaysErrCh <- &ClientError{err: err, SentinelErr: true}:
+		case <-c.closeCh:
+		}
+	}
+
 	for {
+		if err := c.subClient.Ping().Err; err != nil {
+			alwaysErr(err)
+			return
+		}
+
 		r := c.subClient.Receive()
 		if r.Timeout() {
 			continue
 		}
 		if r.Err != nil {
-			select {
-			case c.alwaysErrCh <- &ClientError{err: r.Err, SentinelErr: true}:
-			case <-c.closeCh:
-			}
+			alwaysErr(r.Err)
 			return
 		}
 		sMsg := strings.Split(r.Message, " ")