Updated GuardianSv1 initialization

This commit is contained in:
Tripon Alexandru-Ionut
2019-03-28 10:01:17 +02:00
committed by Dan Christian Bogos
parent 27b7742ac3
commit 56ccc49527

View File

@@ -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)