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

Implement getter method for EventExporterCfg (by ID)

Browse Source 
Removed redundant getter method for default EventExporterCfg.
This commit is contained in:
ionutboangiu
2024-11-22 16:23:01 +02:00
committed by Dan Christian Bogos
parent a4925a68db
commit 9d3e5e62a6
4 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/eescfg.go
View File

@@ -32,11 +32,13 @@ type EEsCfg struct {
Exporters []*EventExporterCfg
}
// GetDefaultExporter returns the exporter with the *default id
func (eeS *EEsCfg) GetDefaultExporter() *EventExporterCfg {
for _, es := range eeS.Exporters {
if es.ID == utils.MetaDefault {
return es
// ExporterCfg iterates over the Exporters slice and returns the exporter
// configuration associated with the specified "id". If none were found, the
// method will return nil.
func (eeS *EEsCfg) ExporterCfg(id string) *EventExporterCfg {
for _, eeCfg := range eeS.Exporters {
if eeCfg.ID == id {
return eeCfg
}
}
return nil

10
config/erscfg.go
View File

@@ -35,12 +35,12 @@ type ERsCfg struct {
PartialCacheTTL time.Duration
}
// ReaderCfg iterates over the Readers slice and returns if it finds any
// reader configuration where the ID is equal to the "ID" parameter. If
// none were found, the method will return nil.
func (erS *ERsCfg) ReaderCfg(ID string) *EventReaderCfg {
// ReaderCfg iterates over the Readers slice and returns the reader
// configuration associated with the specified "id". If none were found, the
// method will return nil.
func (erS *ERsCfg) ReaderCfg(id string) *EventReaderCfg {
for _, rdr := range erS.Readers {
if rdr.ID == ID {
if rdr.ID == id {
return rdr
}
}

10
config/erscfg_test.go
View File

@@ -1410,16 +1410,6 @@ func TestERsloadFromJsonCfg(t *testing.T) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedERsCfg), utils.ToJSON(cfgCgr.ersCfg))
}
}
func TestGetDefaultExporter(t *testing.T) {
ees := new(EEsCfg)
if dft := ees.GetDefaultExporter(); dft != nil {
t.Fatalf("Expected no default cfg, received: %s", utils.ToJSON(dft))
}
cfgCgr := NewDefaultCGRConfig()
if dft := cfgCgr.EEsCfg().GetDefaultExporter(); dft == nil || dft.ID != utils.MetaDefault {
t.Fatalf("Unexpected default cfg returned: %s", utils.ToJSON(dft))
}
}
func TestEventReaderOptsCfg(t *testing.T) {
erCfg := new(EventReaderCfg)
if err := erCfg.Opts.loadFromJSONCfg(nil); err != nil {

10
ees/rpc_test.go
View File

@@ -30,7 +30,7 @@ import (
)
func TestNewRpcEE(t *testing.T) {
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
dc, err := newEEMetrics("Local")
if err != nil {
t.Error(err)
@@ -103,7 +103,7 @@ func TestRPCCfg(t *testing.T) {
}
func TestRPCConnect(t *testing.T) {
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
dc, err := newEEMetrics("Local")
if err != nil {
t.Error(err)
@@ -119,7 +119,7 @@ func TestRPCConnect(t *testing.T) {
}
func TestRPCClose(t *testing.T) {
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
dc, err := newEEMetrics("Local")
if err != nil {
t.Error(err)
@@ -138,7 +138,7 @@ func TestRPCClose(t *testing.T) {
}
func TestRPCGetMetrics(t *testing.T) {
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
dc := &utils.SafeMapStorage{
MapStorage: utils.MapStorage{
"time": "now",
@@ -157,7 +157,7 @@ func TestRPCGetMetrics(t *testing.T) {
}
func TestRPCPrepareMap(t *testing.T) {
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().GetDefaultExporter()
eeSCfg := config.NewDefaultCGRConfig().EEsCfg().ExporterCfg(utils.MetaDefault)
dc, err := newEEMetrics("Local")
if err != nil {
t.Error(err)