Moved GuardianSv1 initialization from rater.go

This commit is contained in:
Tripon Alexandru-Ionut
2019-03-27 16:21:54 +02:00
committed by Dan Christian Bogos
parent 26de08e46a
commit 5eb57ed8b1
2 changed files with 11 additions and 4 deletions

View File

@@ -1150,6 +1150,12 @@ 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,6 +1393,11 @@ func main() {
// 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)

View File

@@ -187,12 +187,9 @@ func startRater(internalRaterChan chan rpcclient.RpcClientConnection, cacheS *en
apierRpcV2 := &v2.ApierV2{
ApierV1: *apierRpcV1}
guardianSv1 := v1.NewGuardianSv1()
server.RpcRegister(responder)
server.RpcRegister(apierRpcV1)
server.RpcRegister(apierRpcV2)
server.RpcRegister(guardianSv1)
utils.RegisterRpcParams("", &v1.CDRsV1{})
utils.RegisterRpcParams("", &v2.CDRsV2{})
@@ -200,7 +197,6 @@ func startRater(internalRaterChan chan rpcclient.RpcClientConnection, cacheS *en
utils.RegisterRpcParams("", responder)
utils.RegisterRpcParams("", apierRpcV1)
utils.RegisterRpcParams("", apierRpcV2)
utils.RegisterRpcParams("", guardianSv1)
utils.GetRpcParams("")
internalRaterChan <- responder // Rater done
}