uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-22 15:48:44 +05:00
Code Issues Packages Projects Releases Wiki Activity

Rename ResourceConfig -> ResourceProfile

Browse Source
This commit is contained in:
TeoV
2017-09-06 10:44:33 -04:00
parent 36d3fb9538
commit c5c030d561
31 changed files with 376 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
engine/storage_map.go
View File

@@ -221,7 +221,8 @@ func (ms *MapStorage) CacheDataFromDB(prefix string, IDs []string, mustBeCached
utils.LCR_PREFIX,
utils.ALIASES_PREFIX,
utils.REVERSE_ALIASES_PREFIX,
utils.ResourceConfigsPrefix,
utils.ResourceProfilesPrefix,
utils.ResourcesPrefix,
utils.TimingsPrefix}, prefix) {
return utils.NewCGRError(utils.REDIS,
utils.MandatoryIEMissingCaps,
@@ -285,8 +286,10 @@ func (ms *MapStorage) CacheDataFromDB(prefix string, IDs []string, mustBeCached
_, err = ms.GetAlias(dataID, true, utils.NonTransactional)
case utils.REVERSE_ALIASES_PREFIX:
_, err = ms.GetReverseAlias(dataID, true, utils.NonTransactional)
case utils.ResourceConfigsPrefix:
_, err = ms.GetResourceCfg(dataID, true, utils.NonTransactional)
case utils.ResourceProfilesPrefix:
_, err = ms.GetResourceProfile(dataID, true, utils.NonTransactional)
case utils.ResourcesPrefix:
_, err = ms.GetResource(dataID, true, utils.NonTransactional)
case utils.TimingsPrefix:
_, err = ms.GetTiming(dataID, true, utils.NonTransactional)
}
@@ -1309,14 +1312,14 @@ func (ms *MapStorage) GetStructVersion() (rsv *StructVersion, err error) {
return
}
func (ms *MapStorage) GetResourceCfg(id string, skipCache bool, transactionID string) (rl *ResourceCfg, err error) {
func (ms *MapStorage) GetResourceProfile(id string, skipCache bool, transactionID string) (rsp *ResourceProfile, err error) {
ms.mu.RLock()
defer ms.mu.RUnlock()
key := utils.ResourceConfigsPrefix + id
key := utils.ResourceProfilesPrefix + id
if !skipCache {
if x, ok := cache.Get(key); ok {
if x != nil {
return x.(*ResourceCfg), nil
return x.(*ResourceProfile), nil
}
return nil, utils.ErrNotFound
}
@@ -1326,34 +1329,34 @@ func (ms *MapStorage) GetResourceCfg(id string, skipCache bool, transactionID st
cache.Set(key, nil, cacheCommit(transactionID), transactionID)
return nil, utils.ErrNotFound
}
err = ms.ms.Unmarshal(values, &rl)
err = ms.ms.Unmarshal(values, &rsp)
if err != nil {
return nil, err
}
for _, fltr := range rl.Filters {
for _, fltr := range rsp.Filters {
if err := fltr.CompileValues(); err != nil {
return nil, err
}
}
cache.Set(key, rl, cacheCommit(transactionID), transactionID)
cache.Set(key, rsp, cacheCommit(transactionID), transactionID)
return
}
func (ms *MapStorage) SetResourceCfg(r *ResourceCfg, transactionID string) error {
func (ms *MapStorage) SetResourceProfile(r *ResourceProfile, transactionID string) error {
ms.mu.Lock()
defer ms.mu.Unlock()
result, err := ms.ms.Marshal(r)
if err != nil {
return err
}
ms.dict[utils.ResourceConfigsPrefix+r.ID] = result
ms.dict[utils.ResourceProfilesPrefix+r.ID] = result
return nil
}
func (ms *MapStorage) RemoveResourceCfg(id string, transactionID string) error {
func (ms *MapStorage) RemoveResourceProfile(id string, transactionID string) error {
ms.mu.Lock()
defer ms.mu.Unlock()
key := utils.ResourceConfigsPrefix + id
key := utils.ResourceProfilesPrefix + id
delete(ms.dict, key)
cache.RemKey(key, cacheCommit(transactionID), transactionID)
return nil