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

Removed error from Items field

Browse Source
This commit is contained in:
porosnicuadrian
2020-11-06 17:51:02 +02:00
committed by Dan Christian Bogos
parent c569752a55
commit 461a7003e5
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/datadbcfg.go
View File

@@ -93,9 +93,7 @@ func (dbcfg *DataDbCfg) loadFromJsonCfg(jsnDbCfg *DbJsonCfg) (err error) {
if val == nil || !has {
val = new(ItemOpt)
}
if err := val.loadFromJsonCfg(vJsn); err != nil {
return err
}
val.loadFromJsonCfg(vJsn) //To review if the function signature changes
dbcfg.Items[kJsn] = val
}
}
@@ -181,7 +179,7 @@ func (itm *ItemOpt) AsMapInterface() (initialMP map[string]interface{}) {
return
}
func (itm *ItemOpt) loadFromJsonCfg(jsonItm *ItemOptJson) (err error) {
func (itm *ItemOpt) loadFromJsonCfg(jsonItm *ItemOptJson) {
if jsonItm == nil {
return
}

8
config/datadbcfg_test.go
View File

@@ -130,11 +130,9 @@ func TestItemCfgloadFromJson(t *testing.T) {
RouteID: "randomID",
}
rcv := new(ItemOpt)
if err := rcv.loadFromJsonCfg(nil); err != nil {
t.Error(err)
} else if err = rcv.loadFromJsonCfg(jsonCfg); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(rcv, expected) {
rcv.loadFromJsonCfg(nil)
rcv.loadFromJsonCfg(jsonCfg)
if !reflect.DeepEqual(rcv, expected) {
t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(rcv))
}
}

4
config/stordbcfg.go
View File

@@ -101,9 +101,7 @@ func (dbcfg *StorDbCfg) loadFromJsonCfg(jsnDbCfg *DbJsonCfg) (err error) {
if jsnDbCfg.Items != nil {
for kJsn, vJsn := range *jsnDbCfg.Items {
val := new(ItemOpt)
if err := val.loadFromJsonCfg(vJsn); err != nil {
return err
}
val.loadFromJsonCfg(vJsn) //To review if the function signature changes
dbcfg.Items[kJsn] = val
}
}