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 RemoveActions in DataManager

Browse Source
This commit is contained in:
TeoV
2017-10-20 18:54:44 +03:00
committed by Dan Christian Bogos
parent 1546720116
commit 35ad39685e
7 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apier/v1/apier.go
View File

@@ -1709,7 +1709,7 @@ func (self *ApierV1) RemoveActions(attr AttrRemoveActions, reply *string) error
}
*/
for _, aID := range attr.ActionIDs {
if err := self.DataManager.DataDB().RemoveActions(aID, utils.NonTransactional); err != nil {
if err := self.DataManager.RemoveActions(aID, utils.NonTransactional); err != nil {
*reply = err.Error()
return err
}

8
engine/datamanager.go
View File

@@ -656,3 +656,11 @@ func (dm *DataManager) SetActions(key string, as Actions, transactionID string)
return dm.DataDB().SetActionsDrv(key, as)
}
}
func (dm *DataManager) RemoveActions(key, transactionID string) (err error) {
if err = dm.DataDB().RemoveActionsDrv(key); err != nil {
return
}
cache.RemKey(utils.ACTION_PREFIX+key, cacheCommit(transactionID), transactionID)
return
}

2
engine/onstor_it_test.go
View File

@@ -1335,7 +1335,7 @@ func testOnStorITCRUDActions(t *testing.T) {
// t.Error(err)
// }
if err := onStor.DataDB().RemoveActions(acts[0].Id, utils.NonTransactional); err != nil {
if err := onStor.RemoveActions(acts[0].Id, utils.NonTransactional); err != nil {
t.Error(err)
}
if _, rcvErr := onStor.GetActions(acts[0].Id, true, utils.NonTransactional); rcvErr != utils.ErrNotFound {

2
engine/storage_interface.go
View File

@@ -68,7 +68,7 @@ type DataDB interface {
SetDerivedChargers(string, *utils.DerivedChargers, string) error
GetActionsDrv(string) (Actions, error)
SetActionsDrv(string, Actions) error
RemoveActions(string, string) error
RemoveActionsDrv(string) error
GetSharedGroupDrv(string) (*SharedGroup, error)
SetSharedGroupDrv(*SharedGroup) error
GetActionTriggersDrv(string) (ActionTriggers, error)

3
engine/storage_map.go
View File

@@ -492,12 +492,11 @@ func (ms *MapStorage) SetActionsDrv(key string, as Actions) (err error) {
return
}
func (ms *MapStorage) RemoveActions(key string, transactionID string) (err error) {
func (ms *MapStorage) RemoveActionsDrv(key string) (err error) {
cachekey := utils.ACTION_PREFIX + key
ms.mu.Lock()
delete(ms.dict, cachekey)
ms.mu.Unlock()
cache.RemKey(cachekey, cacheCommit(transactionID), transactionID)
return
}

3
engine/storage_mongo_datadb.go
View File

@@ -984,11 +984,10 @@ func (ms *MongoStorage) SetActionsDrv(key string, as Actions) error {
return err
}
func (ms *MongoStorage) RemoveActions(key string, transactionID string) error {
func (ms *MongoStorage) RemoveActionsDrv(key string) error {
session, col := ms.conn(colAct)
defer session.Close()
err := col.Remove(bson.M{"key": key})
cache.RemKey(utils.ACTION_PREFIX+key, cacheCommit(transactionID), transactionID)
return err
}

3
engine/storage_redis.go
View File

@@ -540,9 +540,8 @@ func (rs *RedisStorage) SetActionsDrv(key string, as Actions) (err error) {
return
}
func (rs *RedisStorage) RemoveActions(key string, transactionID string) (err error) {
func (rs *RedisStorage) RemoveActionsDrv(key string) (err error) {
err = rs.Cmd("DEL", utils.ACTION_PREFIX+key).Err
cache.RemKey(utils.ACTION_PREFIX+key, cacheCommit(transactionID), transactionID)
return
}