uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Add ees_conns field option for ERs section

Browse Source
This commit is contained in:
ionutboangiu
2023-11-10 16:22:25 -05:00
committed by Dan Christian Bogos
parent 20f2f7353e
commit f4e11d8a5a
4 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/config_json_test.go
View File

@@ -2005,6 +2005,7 @@ func TestDfEventReaderCfg(t *testing.T) {
eCfg := &ERsJsonCfg{
Enabled: utils.BoolPointer(false),
Sessions_conns: &[]string{utils.MetaInternal},
Ees_conns: &[]string{utils.MetaInternal},
Readers: &[]*EventReaderJsonCfg{
{
Id: utils.StringPointer(utils.MetaDefault),

8
config/configsanity.go
View File

@@ -694,6 +694,14 @@ func (cfg *CGRConfig) checkConfigSanity() error {
return fmt.Errorf("<%s> connection with id: <%s> not defined", utils.ERs, connID)
}
}
for _, connID := range cfg.ersCfg.EEsConns {
if strings.HasPrefix(connID, utils.MetaInternal) && !cfg.eesCfg.Enabled {
return fmt.Errorf("<%s> not enabled but requested by <%s> component", utils.EEs, utils.ERs)
}
if _, has := cfg.rpcConns[connID]; !has && !strings.HasPrefix(connID, utils.MetaInternal) {
return fmt.Errorf("<%s> connection with id: <%s> not defined", utils.ERs, connID)
}
}
for _, rdr := range cfg.ersCfg.Readers {
if !possibleReaderTypes.Has(rdr.Type) {
return fmt.Errorf("<%s> unsupported data type: %s for reader with ID: %s", utils.ERs, rdr.Type, rdr.ID)

58
config/erscfg.go
View File

@@ -19,6 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
package config
import (
"slices"
"time"
"github.com/cgrates/cgrates/utils"
@@ -28,6 +29,7 @@ import (
type ERsCfg struct {
Enabled bool
SessionSConns []string
EEsConns []string
Readers []*EventReaderCfg
PartialCacheTTL time.Duration
}
@@ -40,12 +42,26 @@ func (erS *ERsCfg) loadFromJSONCfg(jsnCfg *ERsJsonCfg, msgTemplates map[string][
erS.Enabled = *jsnCfg.Enabled
}
if jsnCfg.Sessions_conns != nil {
erS.SessionSConns = make([]string, len(*jsnCfg.Sessions_conns))
for i, fID := range *jsnCfg.Sessions_conns {
erS.SessionSConns = make([]string, 0, len(*jsnCfg.Sessions_conns))
for _, fID := range *jsnCfg.Sessions_conns {
// if we have the connection internal we change the name so we can have internal rpc for each subsystem
erS.SessionSConns[i] = fID
if fID == utils.MetaInternal {
erS.SessionSConns[i] = utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS)
if fID != utils.MetaInternal {
erS.SessionSConns = append(erS.SessionSConns, fID)
} else {
erS.SessionSConns = append(erS.SessionSConns, utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS))
}
}
}
if jsnCfg.Ees_conns != nil {
erS.EEsConns = make([]string, 0, len(*jsnCfg.Ees_conns))
for _, fID := range *jsnCfg.Ees_conns {
// if we have the connection internal we change the name so we can have internal rpc for each subsystem
if fID != utils.MetaInternal {
erS.EEsConns = append(erS.EEsConns, fID)
} else {
erS.EEsConns = append(erS.EEsConns, utils.ConcatenatedKey(utils.MetaInternal, utils.MetaEEs))
}
}
}
@@ -93,13 +109,11 @@ func (erS *ERsCfg) appendERsReaders(jsnReaders *[]*EventReaderJsonCfg, msgTempla
func (erS *ERsCfg) Clone() (cln *ERsCfg) {
cln = &ERsCfg{
Enabled: erS.Enabled,
SessionSConns: make([]string, len(erS.SessionSConns)),
SessionSConns: slices.Clone(erS.SessionSConns),
EEsConns: slices.Clone(erS.EEsConns),
Readers: make([]*EventReaderCfg, len(erS.Readers)),
PartialCacheTTL: erS.PartialCacheTTL,
}
copy(cln.SessionSConns, erS.SessionSConns)
for idx, rdr := range erS.Readers {
cln.Readers[idx] = rdr.Clone()
}
@@ -116,19 +130,31 @@ func (erS *ERsCfg) AsMapInterface(separator string) (initialMP map[string]any) {
initialMP[utils.PartialCacheTTLCfg] = erS.PartialCacheTTL.String()
}
if erS.SessionSConns != nil {
sessionSConns := make([]string, len(erS.SessionSConns))
for i, item := range erS.SessionSConns {
sessionSConns[i] = item
sessionSConns := make([]string, 0, len(erS.SessionSConns))
for _, item := range erS.SessionSConns {
if item == utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS) {
sessionSConns[i] = utils.MetaInternal
sessionSConns = append(sessionSConns, utils.MetaInternal)
} else {
sessionSConns = append(sessionSConns, item)
}
}
initialMP[utils.SessionSConnsCfg] = sessionSConns
}
if erS.EEsConns != nil {
eesConns := make([]string, 0, len(erS.EEsConns))
for _, item := range erS.EEsConns {
if item == utils.ConcatenatedKey(utils.MetaInternal, utils.MetaEEs) {
eesConns = append(eesConns, utils.MetaInternal)
} else {
eesConns = append(eesConns, item)
}
}
initialMP[utils.EEsConnsCfg] = eesConns
}
if erS.Readers != nil {
readers := make([]map[string]any, len(erS.Readers))
for i, item := range erS.Readers {
readers[i] = item.AsMapInterface(separator)
readers := make([]map[string]any, 0, len(erS.Readers))
for _, item := range erS.Readers {
readers = append(readers, item.AsMapInterface(separator))
}
initialMP[utils.ReadersCfg] = readers
}

1
config/libconfig_json.go
View File

@@ -201,6 +201,7 @@ type CdrsJsonCfg struct {
type ERsJsonCfg struct {
Enabled *bool
Sessions_conns *[]string
Ees_conns *[]string
Readers *[]*EventReaderJsonCfg
Partial_cache_ttl *string
}