apiserver: report online gateways every 5 sec

nais · Jun 10, 2024 · e5b39ed · e5b39ed
1 parent 5721027
commit e5b39ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/cmd/apiserver/main.go b/cmd/apiserver/main.go
@@ -376,6 +376,18 @@ func run(log *logrus.Entry, cfg config.Config) error {
 		cancel()
 	}()
 
+	go func() {
+		ticker := time.NewTicker(5 * time.Second)
+		for ctx.Err() == nil {
+			select {
+			case <-ctx.Done():
+				return
+			case <-ticker.C:
+				grpcHandler.ReportOnlineGateways()
+			}
+		}
+	}()
+
 	sigs := make(chan os.Signal, 1)
 	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
 	go func() {

diff --git a/internal/apiserver/api/gateway.go b/internal/apiserver/api/gateway.go
@@ -32,8 +32,6 @@ func (s *grpcServer) GetGatewayConfiguration(request *pb.GetGatewayConfiguration
 	s.log.Infof("Gateway %s connected (%d active gateways)", request.Gateway, len(s.gatewayConfigTrigger))
 	s.gatewayConfigTriggerLock.Unlock()
 
-	s.reportOnlineGateways()
-
 	for {
 		select {
 		case <-c:
@@ -53,8 +51,6 @@ func (s *grpcServer) GetGatewayConfiguration(request *pb.GetGatewayConfiguration
 			s.log.Infof("Gateway %s disconnected (%d active gateways)", request.Gateway, len(s.gatewayConfigTrigger))
 			s.gatewayConfigTriggerLock.Unlock()
 
-			s.reportOnlineGateways()
-
 			return nil
 		}
 	}
@@ -95,7 +91,7 @@ func (s *grpcServer) MakeGatewayConfiguration(ctx context.Context, gatewayName s
 	return gatewayConfig, nil
 }
 
-func (s *grpcServer) reportOnlineGateways() {
+func (s *grpcServer) ReportOnlineGateways() {
 	s.gatewayConfigTriggerLock.RLock()
 	connectedGatewayNames := make([]string, 0, len(s.gatewayConfigTrigger))
 	for k := range s.gatewayConfigTrigger {