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

Merge pull request #1892 from TeoV/master

Browse Source 
Merge in one CacheSv1.ReloadCache call for APIer
This commit is contained in:
Dan Christian Bogos
2020-01-23 15:48:13 +01:00
committed by GitHub
parent 4a0bf47237 6b15a577b7
commit c31df8ae00
3 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apier/v1/accounts.go
View File

@@ -246,21 +246,13 @@ func (api *ApierV1) SetAccount(attr utils.AttrSetAccount, reply *string) (err er
apIDs[i] = actionPlanID
i++
}
if err := api.ConnMgr.Call(api.Config.ApierCfg().CachesConns, nil,
utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
AttrReloadCache: utils.AttrReloadCache{
ArgsCache: utils.ArgsCache{ActionPlanIDs: &apIDs},
},
}, reply); err != nil {
return 0, err
}
if err := api.DataManager.SetAccountActionPlans(accID, acntAPids, true); err != nil {
return 0, err
}
if err := api.ConnMgr.Call(api.Config.ApierCfg().CachesConns, nil,
utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
AttrReloadCache: utils.AttrReloadCache{
ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}},
ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}, ActionPlanIDs: &apIDs},
},
}, reply); err != nil {
return 0, err

11
apier/v1/apier.go
View File

@@ -151,21 +151,14 @@ func (apiv1 *ApierV1) SetDestination(attrs utils.AttrSetDestination, reply *stri
if err := apiv1.DataManager.SetDestination(dest, utils.NonTransactional); err != nil {
return utils.NewErrServerError(err)
}
if err := apiv1.ConnMgr.Call(apiv1.Config.ApierCfg().CachesConns, nil,
utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
AttrReloadCache: utils.AttrReloadCache{
ArgsCache: utils.ArgsCache{DestinationIDs: &[]string{attrs.Id}},
},
}, reply); err != nil {
return err
}
if err = apiv1.DataManager.UpdateReverseDestination(oldDest, dest, utils.NonTransactional); err != nil {
return
}
if err := apiv1.ConnMgr.Call(apiv1.Config.ApierCfg().CachesConns, nil,
utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
AttrReloadCache: utils.AttrReloadCache{
ArgsCache: utils.ArgsCache{ReverseDestinationIDs: &dest.Prefixes},
ArgsCache: utils.ArgsCache{ReverseDestinationIDs: &dest.Prefixes,
DestinationIDs: &[]string{attrs.Id}},
},
}, reply); err != nil {
return err

10
apier/v2/accounts.go
View File

@@ -186,21 +186,13 @@ func (apiv2 *ApierV2) SetAccount(attr AttrSetAccount, reply *string) error {
apIDs[i] = actionPlanID
i++
}
if err := apiv2.ConnMgr.Call(apiv2.Config.ApierCfg().CachesConns, nil,
utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
AttrReloadCache: utils.AttrReloadCache{
ArgsCache: utils.ArgsCache{ActionPlanIDs: &apIDs},
},
}, reply); err != nil {
return 0, err
}
if err := apiv2.DataManager.SetAccountActionPlans(accID, acntAPids, true); err != nil {
return 0, err
}
return 0, apiv2.ConnMgr.Call(apiv2.Config.ApierCfg().CachesConns, nil,
utils.CacheSv1ReloadCache, utils.AttrReloadCacheWithArgDispatcher{
AttrReloadCache: utils.AttrReloadCache{
ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}},
ArgsCache: utils.ArgsCache{AccountActionPlanIDs: &[]string{accID}, ActionPlanIDs: &apIDs},
},
}, reply)
}, config.CgrConfig().GeneralCfg().LockingTimeout, utils.ACTION_PLAN_PREFIX)