From 56ccc495272f7c270067010015b84f5f4bf4924c Mon Sep 17 00:00:00 2001
From: Tripon Alexandru-Ionut <alexandru.tripon@itsyscom.com>
Date: Thu, 28 Mar 2019 10:01:17 +0200
Subject: [PATCH] Updated GuardianSv1 initialization

---
 cmd/cgr-engine/cgr-engine.go | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go
index 85afadab8..6f89e95bb 100644
--- a/cmd/cgr-engine/cgr-engine.go
+++ b/cmd/cgr-engine/cgr-engine.go
@@ -1052,6 +1052,12 @@ func initCacheS(internalCacheSChan chan rpcclient.RpcClientConnection,
 	return
 }
 
+func initGuardianSv1(server *utils.Server) {
+	if !cfg.DispatcherSCfg().Enabled {
+		server.RpcRegister(v1.NewGuardianSv1())
+	}
+}
+
 func initSchedulerS(internalCacheSChan chan rpcclient.RpcClientConnection,
 	srvMngr *servmanager.ServiceManager, server *utils.Server) {
 	schdS := servmanager.NewSchedulerS(srvMngr)
@@ -1150,12 +1156,6 @@ func startRpc(server *utils.Server, internalRaterChan,
 	}
 }
 
-func initGuardianSv1(server *utils.Server) {
-	guardianSv1 := v1.NewGuardianSv1()
-	server.RpcRegister(guardianSv1)
-	utils.RegisterRpcParams("", guardianSv1)
-}
-
 func writePid() {
 	utils.Logger.Info(*pidFile)
 	f, err := os.Create(*pidFile)
@@ -1387,17 +1387,15 @@ func main() {
 	// init CacheS
 	cacheS := initCacheS(internalCacheSChan, server, dm, exitChan)
 
+	// init GuardianSv1
+	initGuardianSv1(server)
+
 	// Start ServiceManager
 	srvManager := servmanager.NewServiceManager(cfg, dm, exitChan, cacheS)
 
 	// init SchedulerS
 	initSchedulerS(internalSchedSChan, srvManager, server)
 
-	// Start GuardianSv1
-	if !cfg.DispatcherSCfg().Enabled {
-		go initGuardianSv1(server)
-	}
-
 	// Start Scheduler
 	if cfg.SchedulerCfg().Enabled {
 		go srvManager.StartScheduler(true)