uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-15 21:29:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

Adding CdrReplication config for raw CDRS

Browse Source
This commit is contained in:
DanB
2015-03-19 10:51:42 +01:00
parent 98551316d6
commit c26bfcdb1f
4 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
config/config.go
View File

@@ -183,13 +183,14 @@ type CGRConfig struct {
RaterBalancer string // balancer address host:port
BalancerEnabled bool
SchedulerEnabled bool
CDRSEnabled bool // Enable CDR Server service
CDRSExtraFields []*utils.RSRField // Extra fields to store in CDRs
CDRSMediator string // Address where to reach the Mediator. Empty for disabling mediation. <""|internal>
CDRSStats string // Address where to reach the Mediator. <""|intenal>
CDRSStoreDisable bool // When true, CDRs will not longer be saved in stordb, useful for cdrstats only scenario
CDRStatsEnabled bool // Enable CDR Stats service
CDRStatConfig *CdrStatsConfig // Active cdr stats configuration instances, platform level
CDRSEnabled bool // Enable CDR Server service
CDRSExtraFields []*utils.RSRField // Extra fields to store in CDRs
CDRSMediator string // Address where to reach the Mediator. Empty for disabling mediation. <""|internal>
CDRSStats string // Address where to reach the Mediator. <""|intenal>
CDRSStoreDisable bool // When true, CDRs will not longer be saved in stordb, useful for cdrstats only scenario
CDRSCdrReplication []*CdrReplicationCfg // Replicate raw CDRs to a number of servers
CDRStatsEnabled bool // Enable CDR Stats service
CDRStatConfig *CdrStatsConfig // Active cdr stats configuration instances, platform level
CdreProfiles map[string]*CdreConfig
CdrcProfiles map[string]map[string]*CdrcConfig // Number of CDRC instances running imports, format map[dirPath]map[instanceName]{Configs}
SmFsConfig *SmFsConfig // SM-FreeSWITCH configuration
@@ -200,6 +201,7 @@ type CGRConfig struct {
MediatorRater string
MediatorStats string // Address where to reach the Rater: <internal|x.y.z.y:1234>
MediatorStoreDisable bool // When true, CDRs will not longer be saved in stordb, useful for cdrstats only scenario
MediCdrReplication []*CdrReplicationCfg // Replicate CDRs to a number of servers
HistoryAgentEnabled bool // Starts History as an agent: <true|false>.
HistoryServer string // Address where to reach the master history server: <internal|x.y.z.y:1234>
HistoryServerEnabled bool // Starts History as server: <true|false>.
@@ -464,6 +466,20 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) error {
if jsnCdrsCfg.Store_disable != nil {
self.CDRSStoreDisable = *jsnCdrsCfg.Store_disable
}
if jsnCdrsCfg.Cdr_replication != nil {
for idx, rplJsonCfg := range *jsnCdrsCfg.Cdr_replication {
self.MediCdrReplication[idx] = new(CdrReplicationCfg)
if rplJsonCfg.Transport != nil {
self.MediCdrReplication[idx].Transport = *rplJsonCfg.Transport
}
if rplJsonCfg.Server != nil {
self.MediCdrReplication[idx].Server = *rplJsonCfg.Server
}
if rplJsonCfg.Synchronous != nil {
self.MediCdrReplication[idx].Synchronous = *rplJsonCfg.Synchronous
}
}
}
}
if jsnCdrstatsCfg != nil {
if jsnCdrstatsCfg.Enabled != nil {
@@ -545,6 +561,20 @@ func (self *CGRConfig) loadFromJsonCfg(jsnCfg *CgrJsonCfg) error {
if jsnMediatorCfg.Store_disable != nil {
self.MediatorStoreDisable = *jsnMediatorCfg.Store_disable
}
if jsnMediatorCfg.Cdr_replication != nil {
for idx, rplJsonCfg := range *jsnMediatorCfg.Cdr_replication {
self.MediCdrReplication[idx] = new(CdrReplicationCfg)
if rplJsonCfg.Transport != nil {
self.MediCdrReplication[idx].Transport = *rplJsonCfg.Transport
}
if rplJsonCfg.Server != nil {
self.MediCdrReplication[idx].Server = *rplJsonCfg.Server
}
if rplJsonCfg.Synchronous != nil {
self.MediCdrReplication[idx].Synchronous = *rplJsonCfg.Synchronous
}
}
}
}
if jsnHistAgentCfg != nil {

1
config/config_defaults.go
View File

@@ -100,6 +100,7 @@ const CGRATES_CFG_JSON = `
"mediator": "", // address where to reach the Mediator. Empty for disabling mediation. <""|internal>
"cdrstats": "", // address where to reach the cdrstats service. Empty to disable stats gathering from raw CDRs <""|internal|x.y.z.y:1234>
"store_disable": false, // when true, CDRs will not longer be saved in stordb, useful for cdrstats only scenario
"cdr_replication":[], // replicate the raw CDR to a number of servers
},

11
config/config_json_test.go
View File

@@ -137,11 +137,12 @@ func TestDfSchedulerJsonCfg(t *testing.T) {
func TestDfCdrsJsonCfg(t *testing.T) {
eCfg := &CdrsJsonCfg{
Enabled: utils.BoolPointer(false),
Extra_fields: utils.StringSlicePointer([]string{}),
Mediator: utils.StringPointer(""),
Cdrstats: utils.StringPointer(""),
Store_disable: utils.BoolPointer(false),
Enabled: utils.BoolPointer(false),
Extra_fields: utils.StringSlicePointer([]string{}),
Mediator: utils.StringPointer(""),
Cdrstats: utils.StringPointer(""),
Store_disable: utils.BoolPointer(false),
Cdr_replication: &[]*CdrReplicationJsonCfg{},
}
if cfg, err := dfCgrJsonCfg.CdrsJsonCfg(); err != nil {
t.Error(err)

11
config/libconfig_json.go
View File

@@ -67,11 +67,12 @@ type SchedulerJsonCfg struct {
// Cdrs config section
type CdrsJsonCfg struct {
Enabled *bool
Extra_fields *[]string
Mediator *string
Cdrstats *string
Store_disable *bool
Enabled *bool
Extra_fields *[]string
Mediator *string
Cdrstats *string
Store_disable *bool
Cdr_replication *[]*CdrReplicationJsonCfg
}
type CdrReplicationJsonCfg struct {