diff --git a/agents/diam_it_test.go b/agents/diam_it_test.go index a9c4caaf7..b63788d6a 100644 --- a/agents/diam_it_test.go +++ b/agents/diam_it_test.go @@ -20,7 +20,6 @@ package agents import ( "errors" "flag" - "fmt" "net/rpc" "net/rpc/jsonrpc" "os/exec" @@ -202,7 +201,6 @@ func testDiamItApierRpcConn(t *testing.T) { var err error apierRpc, err = newRPCClient(daCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { - fmt.Println(err) t.Fatal(err) } } diff --git a/data/conf/samples/cdrsv1mongo/cgrates.json b/data/conf/samples/cdrsv1mongo/cgrates.json index 01b81d9c4..747684b93 100644 --- a/data/conf/samples/cdrsv1mongo/cgrates.json +++ b/data/conf/samples/cdrsv1mongo/cgrates.json @@ -29,16 +29,12 @@ "cdrs": { "enabled": true, - "rals_conns": [ - {"address": "127.0.0.1:2012", "transport":"*json"}, - ], + "rals_conns": ["*localhost"], }, "apier": { - "scheduler_conns": [ // connections to SchedulerS for reloads - {"address": "*internal"}, - ], + "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/cdrsv1mysql/cgrates.json b/data/conf/samples/cdrsv1mysql/cgrates.json index 10ad516c9..808ce5ecc 100644 --- a/data/conf/samples/cdrsv1mysql/cgrates.json +++ b/data/conf/samples/cdrsv1mysql/cgrates.json @@ -26,16 +26,12 @@ "cdrs": { "enabled": true, - "rals_conns": [ - {"address": "127.0.0.1:2012", "transport":"*json"}, - ], + "rals_conns": ["*localhost"], }, "apier": { - "scheduler_conns": [ // connections to SchedulerS for reloads - {"address": "*internal"}, - ], + "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/cdrsv1postgres/cgrates.json b/data/conf/samples/cdrsv1postgres/cgrates.json index d1ac60b9d..64c4b7016 100644 --- a/data/conf/samples/cdrsv1postgres/cgrates.json +++ b/data/conf/samples/cdrsv1postgres/cgrates.json @@ -28,16 +28,12 @@ "cdrs": { "enabled": true, - "rals_conns": [ - {"address": "127.0.0.1:2012", "transport":"*json"}, - ], + "rals_conns": ["*localhost"], }, "apier": { - "scheduler_conns": [ // connections to SchedulerS for reloads - {"address": "*internal"}, - ], + "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/diamagent/cgrates.json b/data/conf/samples/diamagent/cgrates.json index e221c9b0b..2a9db0992 100644 --- a/data/conf/samples/diamagent/cgrates.json +++ b/data/conf/samples/diamagent/cgrates.json @@ -47,9 +47,7 @@ "chargers": { "enabled": true, - "attributes_conns": [ - {"address": "*internal"} - ], + "attributes_conns": ["*internal"], }, diff --git a/data/conf/samples/diamagentmaxconn/cgrates.json b/data/conf/samples/diamagentmaxconn/cgrates.json index e0658542e..ef5bf446d 100755 --- a/data/conf/samples/diamagentmaxconn/cgrates.json +++ b/data/conf/samples/diamagentmaxconn/cgrates.json @@ -46,9 +46,7 @@ "chargers": { "enabled": true, - "attributes_conns": [ - {"address": "*internal"} - ], + "attributes_conns": ["*internal"], }, diff --git a/data/conf/samples/diamsctpagent/cgrates.json b/data/conf/samples/diamsctpagent/cgrates.json index 500642cf4..c68a09d90 100755 --- a/data/conf/samples/diamsctpagent/cgrates.json +++ b/data/conf/samples/diamsctpagent/cgrates.json @@ -47,9 +47,7 @@ "chargers": { "enabled": true, - "attributes_conns": [ - {"address": "*internal"} - ], + "attributes_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/dispatchers/cgrates.json b/data/conf/samples/dispatchers/dispatchers/cgrates.json index 86368cbd4..3627a21d8 100755 --- a/data/conf/samples/dispatchers/dispatchers/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers/cgrates.json @@ -47,7 +47,7 @@ "sessions": { "enabled": true, - "attributes_conns": ["*internal"], + "attributes_conns": ["*internal"], "rals_conns": ["*internal"], "chargers_conns": ["*internal"], "listen_bijson": ":3014", diff --git a/engine/cdrs.go b/engine/cdrs.go index 7f6330e60..c7bb2060e 100644 --- a/engine/cdrs.go +++ b/engine/cdrs.go @@ -189,7 +189,7 @@ var reqTypes = utils.NewStringSet([]string{utils.META_PSEUDOPREPAID, utils.META_ // getCostFromRater will retrieve the cost from RALs func (cdrS *CDRServer) getCostFromRater(cdr *CDRWithArgDispatcher) (*CallCost, error) { - if cdrS.rals == nil { + if len(cdrS.cgrCfg.CdrsCfg().RaterConns) == 0 { return nil, utils.NewErrNotConnected(utils.RALService) } cc := new(CallCost)