[v2] Add IsReady method to App interface and implement connection checks

app.go

@@ -27,7 +27,6 @@ import (
 	"reflect"
 	"strings"
 	"syscall"
-
 	"time"
 
 	"github.com/golang/protobuf/proto"
@@ -128,6 +127,7 @@ type Pitaya interface {
 	GetModule(name string) (interfaces.Module, error)
 
 	GetNumberOfConnectedClients() int64
+	IsReady(ctx context.Context) bool
 }
 
 // App is the base app struct
@@ -567,3 +567,41 @@ func (app *App) RegisterRPCJob(rpcJob worker.RPCJob) error {
 func (app *App) GetNumberOfConnectedClients() int64 {
 	return app.sessionPool.GetSessionCount()
 }
+
+// IsReady checks if pitaya is ready and able to serve requests
+func (app *App) IsReady(ctx context.Context) bool {
+	if !app.IsRunning() {
+		return false
+	}
+
+	// Check NATS RPC Client connection
+	if app.rpcClient != nil {
+		if natsClient, ok := app.rpcClient.(*cluster.NatsRPCClient); ok {
+			if !natsClient.IsConnected() {
+				logger.Log.Info("pitaya is not ready")
+				return false
+			}
+		}
+	}
+
+	// Check NATS RPC Server connection
+	if app.rpcServer != nil {
+		if natsServer, ok := app.rpcServer.(*cluster.NatsRPCServer); ok {
+			if !natsServer.IsConnected() {
+				logger.Log.Info("pitaya is not ready")
+				return false
+			}
+		}
+	}
+
+	// Check ETCD connection
+	if app.serviceDiscovery != nil {
+		if !app.serviceDiscovery.IsConnected(ctx) {
+			logger.Log.Info("pitaya is not ready")
+			return false
+		}
+	}
+
+	logger.Log.Info("pitaya is ready")
+	return true
+}

cluster/etcd_service_discovery.go

@@ -550,7 +550,7 @@ func (sd *etcdServiceDiscovery) SyncServers(firstSync bool) error {
 	}
 
 	// delete invalid servers (local ones that are not in etcd)
-	var allIds = make([]string, 0)
+	allIds := make([]string, 0)
 
 	// Spawn worker goroutines that will work in parallel
 	parallelGetter := newParallelGetter(sd.cli, sd.syncServersParallelism)
@@ -716,7 +716,6 @@ func (sd *etcdServiceDiscovery) watchEtcdChanges() {
 			case <-sd.stopChan:
 				return
 			}
-
 		}
 	}(w)
 }
@@ -729,3 +728,15 @@ func (sd *etcdServiceDiscovery) isServerTypeBlacklisted(svType string) bool {
 	}
 	return false
 }
+
+func (sd *etcdServiceDiscovery) IsConnected(ctx context.Context) bool {
+	if sd.cli == nil {
+		return false
+	}
+
+	checkCtx, cancel := context.WithTimeout(ctx, sd.revokeTimeout)
+	defer cancel()
+
+	_, err := sd.cli.Get(checkCtx, "health-check", clientv3.WithLimit(1))
+	return err == nil
+}

cluster/nats_rpc_client.go

@@ -260,7 +260,6 @@ func (ns *NatsRPCClient) Init() error {
 
 // initConnection initializes or replaces the NATS connection
 func (ns *NatsRPCClient) initConnection(isReplacement bool) error {
-
 	if !isReplacement {
 		ns.running = true
 		logger.Log.Debugf("connecting to nats (client) with timeout of %s", ns.connectionTimeout)
@@ -310,3 +309,7 @@ func (ns *NatsRPCClient) stop() {
 func (ns *NatsRPCClient) getSubscribeChannel() string {
 	return fmt.Sprintf("pitaya/servers/%s/%s", ns.server.Type, ns.server.ID)
 }
+
+func (ns *NatsRPCClient) IsConnected() bool {
+	return ns.conn != nil && ns.conn.IsConnected()
+}

cluster/nats_rpc_server.go

@@ -350,7 +350,6 @@ func (ns *NatsRPCServer) Init() error {
 
 // initConnection initializes or replaces the NATS connection
 func (ns *NatsRPCServer) initConnection(isReplacement bool) error {
-
 	if !isReplacement {
 		// TODO should we have concurrency here? it feels like we should
 		go ns.handleMessages()
@@ -482,3 +481,7 @@ func (ns *NatsRPCServer) reportMetrics() {
 		}
 	}
 }
+
+func (ns *NatsRPCServer) IsConnected() bool {
+	return ns.conn != nil && ns.conn.IsConnected()
+}

cluster/service_discovery.go

@@ -20,7 +20,11 @@
 
 package cluster
 
-import "github.com/topfreegames/pitaya/v2/interfaces"
+import (
+	"context"
+
+	"github.com/topfreegames/pitaya/v2/interfaces"
+)
 
 // ServiceDiscovery is the interface for a service discovery client
 type ServiceDiscovery interface {
@@ -29,5 +33,6 @@ type ServiceDiscovery interface {
 	GetServers() []*Server
 	SyncServers(firstSync bool) error
 	AddListener(listener SDListener)
+	IsConnected(ctx context.Context) bool
 	interfaces.Module
 }

static.go

@@ -230,3 +230,7 @@ func GetModule(name string) (interfaces.Module, error) {
 func GetNumberOfConnectedClients() int64 {
 	return DefaultApp.GetNumberOfConnectedClients()
 }
+
+func IsReady(ctx context.Context) bool {
+	return DefaultApp.IsReady(ctx)
+}