From 5eb57ed8b155bbc663d39b8c885a6f5e338c5231 Mon Sep 17 00:00:00 2001 From: Tripon Alexandru-Ionut Date: Wed, 27 Mar 2019 16:21:54 +0200 Subject: [PATCH] Moved GuardianSv1 initialization from rater.go --- cmd/cgr-engine/cgr-engine.go | 11 +++++++++++ cmd/cgr-engine/rater.go | 4 ---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 983a617ef..85afadab8 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -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) diff --git a/cmd/cgr-engine/rater.go b/cmd/cgr-engine/rater.go index 66cc6fe03..d7a7087a5 100755 --- a/cmd/cgr-engine/rater.go +++ b/cmd/cgr-engine/rater.go @@ -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 }