changer to reconnect to redis when disconnected

Author: minami14

api.go

@@ -111,11 +111,39 @@ func (s *RoomAPIServer) Start() error {
 		return err
 	}
 
-	go s.subscribe(psc)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
+	go func(ctx context.Context, psc redis.PubSubConn) {
+		if err := s.subscribe(ctx, psc); err != nil {
+			s.Logger.Println(err)
+		}
+
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+			}
+
+			redisConn, err := redis.Dial("tcp", s.RedisHost)
+			if err != nil {
+				s.Logger.Println(err)
+				break
+			}
+
+			psc = redis.PubSubConn{Conn: redisConn}
+			if err := psc.Subscribe(channelServer, channelRoom); err != nil {
+				s.Logger.Println(err)
+				break
+			}
+
+			if err := s.subscribe(ctx, psc); err != nil {
+				s.Logger.Println(err)
+			}
+		}
+	}(ctx, psc)
+
 	go s.serverManager.DeleteUnhealthServerAtPeriodic(ctx, s.ServerDeadLine)
 	go s.roomManager.DeleteDeadRoomAtPeriodic(ctx, s.RoomDeadLine)
 

redis.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"context"
 	"github.com/golang/protobuf/proto"
 	"github.com/gomodule/redigo/redis"
 	pb "github.com/iguagile/iguagile-room-proto/room"
@@ -18,8 +19,14 @@ const (
 	unregisterRoomMessage
 )
 
-func (s *RoomAPIServer) subscribe(psc redis.PubSubConn) {
+func (s *RoomAPIServer) subscribe(ctx context.Context, psc redis.PubSubConn) error {
 	for {
+		select {
+		case <-ctx.Done():
+			return nil
+		default:
+		}
+
 		switch v := psc.Receive().(type) {
 		case redis.Message:
 			if len(v.Data) <= 1 {
@@ -61,7 +68,7 @@ func (s *RoomAPIServer) subscribe(psc redis.PubSubConn) {
 		case redis.Subscription:
 			s.Logger.Printf("Subscribe %v %v %v\n", v.Channel, v.Kind, v.Count)
 		case error:
-			s.Logger.Println(v)
+			return v
 		}
 	}
 }