Export funcs that wait for service state

2026-02-14 20:59:53 +05:00 · 2025-01-10 18:08:48 +02:00
parent 089dfc00ae
commit bf3d9a3281
33 changed files with 41 additions and 41 deletions
--- a/services/accounts.go
+++ b/services/accounts.go
@@ -60,7 +60,7 @@ type AccountService struct {

 // Start should handle the service start
 func (acts *AccountService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/actions.go
+++ b/services/actions.go
@@ -61,7 +61,7 @@ type ActionService struct {

 // Start should handle the service start
 func (acts *ActionService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/adminsv1.go
+++ b/services/adminsv1.go
@@ -58,7 +58,7 @@ type AdminSv1Service struct {
 // Start should handle the sercive start
 // For this service the start should be called from RAL Service
 func (apiService *AdminSv1Service) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
--- a/services/analyzers.go
+++ b/services/analyzers.go
@@ -58,7 +58,7 @@ type AnalyzerService struct {

 // Start should handle the sercive start
 func (anz *AnalyzerService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	cls, err := waitForServiceState(utils.StateServiceUP, utils.CommonListenerS, registry,
+	cls, err := WaitForServiceState(utils.StateServiceUP, utils.CommonListenerS, registry,
 		anz.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return
@@ -84,7 +84,7 @@ func (anz *AnalyzerService) Start(shutdown *utils.SyncedChan, registry *servmana
 }

 func (anz *AnalyzerService) start(registry *servmanager.ServiceRegistry) {
-	fs, err := waitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
+	fs, err := WaitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
 		anz.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return
--- a/services/attributes.go
+++ b/services/attributes.go
@@ -58,7 +58,7 @@ type AttributeService struct {

 // Start should handle the service start
 func (attrS *AttributeService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/caches.go
+++ b/services/caches.go
@@ -54,7 +54,7 @@ type CacheService struct {

 // Start should handle the sercive start
 func (cS *CacheService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.DataDB,
--- a/services/cdrs.go
+++ b/services/cdrs.go
@@ -57,7 +57,7 @@ type CDRService struct {

 // Start should handle the sercive start
 func (cs *CDRService) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
--- a/services/chargers.go
+++ b/services/chargers.go
@@ -55,7 +55,7 @@ type ChargerService struct {

 // Start should handle the service start
 func (chrS *ChargerService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/config.go
+++ b/services/config.go
@@ -48,7 +48,7 @@ type ConfigService struct {

 // Start handles the service start.
 func (s *ConfigService) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.AnalyzerS,
--- a/services/cores.go
+++ b/services/cores.go
@@ -64,7 +64,7 @@ type CoreService struct {

 // Start should handle the service start
 func (cS *CoreService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.AnalyzerS,
--- a/services/diameteragent.go
+++ b/services/diameteragent.go
@@ -60,7 +60,7 @@ type DiameterAgent struct {

 // Start should handle the sercive start
 func (da *DiameterAgent) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	fs, err := waitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
+	fs, err := WaitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
 		da.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return err
@@ -102,7 +102,7 @@ func (da *DiameterAgent) Reload(shutdown *utils.SyncedChan, registry *servmanage
 	}
 	close(da.stopChan)

-	fs, err := waitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
+	fs, err := WaitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
 		da.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return err
--- a/services/dispatchers.go
+++ b/services/dispatchers.go
@@ -58,7 +58,7 @@ type DispatcherService struct {

 // Start should handle the sercive start
 func (dspS *DispatcherService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/dnsagent.go
+++ b/services/dnsagent.go
@@ -56,7 +56,7 @@ type DNSAgent struct {

 // Start should handle the service start
 func (dns *DNSAgent) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	fs, err := waitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
+	fs, err := WaitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
 		dns.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return
@@ -77,7 +77,7 @@ func (dns *DNSAgent) Start(shutdown *utils.SyncedChan, registry *servmanager.Ser

 // Reload handles the change of config
 func (dns *DNSAgent) Reload(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	fs, err := waitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
+	fs, err := WaitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
 		dns.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return
--- a/services/ees.go
+++ b/services/ees.go
@@ -84,7 +84,7 @@ func (es *EventExporterService) Shutdown(_ *servmanager.ServiceRegistry) error {

 // Start should handle the service start
 func (es *EventExporterService) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
--- a/services/efs.go
+++ b/services/efs.go
@@ -57,7 +57,7 @@ func NewExportFailoverService(cfg *config.CGRConfig, connMgr *engine.ConnManager

 // Start should handle the service start
 func (efServ *ExportFailoverService) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	cls, err := waitForServiceState(utils.StateServiceUP, utils.CommonListenerS, registry,
+	cls, err := WaitForServiceState(utils.StateServiceUP, utils.CommonListenerS, registry,
 		efServ.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return
--- a/services/ers.go
+++ b/services/ers.go
@@ -61,7 +61,7 @@ type EventReaderService struct {

 // Start should handle the sercive start
 func (erS *EventReaderService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
--- a/services/filters.go
+++ b/services/filters.go
@@ -52,7 +52,7 @@ type FilterService struct {

 // Start handles the service start.
 func (s *FilterService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CacheS,
 			utils.DataDB,
--- a/services/guardian.go
+++ b/services/guardian.go
@@ -49,7 +49,7 @@ type GuardianService struct {

 // Start handles the service start.
 func (s *GuardianService) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.AnalyzerS,
--- a/services/httpagent.go
+++ b/services/httpagent.go
@@ -59,7 +59,7 @@ type HTTPAgent struct {

 // Start should handle the sercive start
 func (ha *HTTPAgent) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
--- a/services/janus.go
+++ b/services/janus.go
@@ -60,7 +60,7 @@ type JanusAgent struct {

 // Start should jandle the sercive start
 func (ja *JanusAgent) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
--- a/services/loaders.go
+++ b/services/loaders.go
@@ -58,7 +58,7 @@ type LoaderService struct {

 // Start should handle the service start
 func (ldrs *LoaderService) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
@@ -98,7 +98,7 @@ func (ldrs *LoaderService) Start(_ *utils.SyncedChan, registry *servmanager.Serv

 // Reload handles the change of config
 func (ldrs *LoaderService) Reload(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) error {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.FilterS,
 			utils.DataDB,
--- a/services/radiusagent.go
+++ b/services/radiusagent.go
@@ -59,7 +59,7 @@ type RadiusAgent struct {

 // Start should handle the sercive start
 func (rad *RadiusAgent) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	fs, err := waitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
+	fs, err := WaitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
 		rad.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return
--- a/services/rankings.go
+++ b/services/rankings.go
@@ -61,7 +61,7 @@ type RankingService struct {
 func (ran *RankingService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
 	ran.srvDep[utils.DataDB].Add(1)

-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/rates.go
+++ b/services/rates.go
@@ -82,7 +82,7 @@ func (rs *RateService) Shutdown(_ *servmanager.ServiceRegistry) (err error) {

 // Start should handle the service start
 func (rs *RateService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/resources.go
+++ b/services/resources.go
@@ -61,7 +61,7 @@ type ResourceService struct {
 func (reS *ResourceService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
 	reS.srvDep[utils.DataDB].Add(1)

-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/routes.go
+++ b/services/routes.go
@@ -55,7 +55,7 @@ type RouteService struct {

 // Start should handle the sercive start
 func (routeS *RouteService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/sessions.go
+++ b/services/sessions.go
@@ -60,7 +60,7 @@ type SessionService struct {

 // Start should handle the service start
 func (smg *SessionService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.FilterS,
--- a/services/sipagent.go
+++ b/services/sipagent.go
@@ -56,7 +56,7 @@ type SIPAgent struct {

 // Start should handle the sercive start
 func (sip *SIPAgent) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
-	fs, err := waitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
+	fs, err := WaitForServiceState(utils.StateServiceUP, utils.FilterS, registry,
 		sip.cfg.GeneralCfg().ConnectTimeout)
 	if err != nil {
 		return
--- a/services/statedeps.go
+++ b/services/statedeps.go
@@ -50,13 +50,13 @@ func (sDs *StateDependencies) StateChan(stateID string) (retChan chan struct{})
 	return
 }

-// waitForServicesToReachState ensures each service reaches the desired state, with the timeout applied individually per service.
+// WaitForServicesToReachState ensures each service reaches the desired state, with the timeout applied individually per service.
 // Returns a map of service names to their instances or an error if any service fails to reach its state within its timeout window.
-func waitForServicesToReachState(state string, serviceIDs []string, indexer *servmanager.ServiceRegistry, timeout time.Duration,
+func WaitForServicesToReachState(state string, serviceIDs []string, indexer *servmanager.ServiceRegistry, timeout time.Duration,
 ) (map[string]servmanager.Service, error) {
 	services := make(map[string]servmanager.Service, len(serviceIDs))
 	for _, serviceID := range serviceIDs {
-		srv, err := waitForServiceState(state, serviceID, indexer, timeout)
+		srv, err := WaitForServiceState(state, serviceID, indexer, timeout)
 		if err != nil {
 			return nil, err
 		}
@@ -66,9 +66,9 @@ func waitForServicesToReachState(state string, serviceIDs []string, indexer *ser
 	return services, nil
 }

-// waitForServiceState waits up to timeout duration for a service to reach the specified state.
+// WaitForServiceState waits up to timeout duration for a service to reach the specified state.
 // Returns the service instance or an error if the timeout is exceeded.
-func waitForServiceState(state, serviceID string, indexer *servmanager.ServiceRegistry, timeout time.Duration,
+func WaitForServiceState(state, serviceID string, indexer *servmanager.ServiceRegistry, timeout time.Duration,
 ) (servmanager.Service, error) {
 	srv := indexer.Lookup(serviceID)
 	if serviceID == utils.AnalyzerS && !srv.ShouldRun() {
--- a/services/stats.go
+++ b/services/stats.go
@@ -59,7 +59,7 @@ type StatService struct {
 func (sts *StatService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
 	sts.srvDep[utils.DataDB].Add(1)

-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/thresholds.go
+++ b/services/thresholds.go
@@ -61,7 +61,7 @@ type ThresholdService struct {
 func (thrs *ThresholdService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
 	thrs.srvDep[utils.DataDB].Add(1)

-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,
--- a/services/tpes.go
+++ b/services/tpes.go
@@ -58,7 +58,7 @@ type TPeService struct {
 // Start should handle the service start
 func (ts *TPeService) Start(_ *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {

-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.DataDB,
--- a/services/trends.go
+++ b/services/trends.go
@@ -60,7 +60,7 @@ type TrendService struct {
 func (trs *TrendService) Start(shutdown *utils.SyncedChan, registry *servmanager.ServiceRegistry) (err error) {
 	trs.srvDep[utils.DataDB].Add(1)

-	srvDeps, err := waitForServicesToReachState(utils.StateServiceUP,
+	srvDeps, err := WaitForServicesToReachState(utils.StateServiceUP,
 		[]string{
 			utils.CommonListenerS,
 			utils.CacheS,