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

cache refactoring for save and load

Browse Source
This commit is contained in:
Radu Ioan Fericean
2016-06-07 22:43:02 +03:00
parent 95e8230a5c
commit e84e28faae
35 changed files with 736 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apier/v1/apier.go
View File

@@ -28,7 +28,6 @@ import (
"strings"
"time"
"github.com/cgrates/cgrates/cache2go"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/scheduler"
@@ -813,15 +812,15 @@ func (self *ApierV1) ReloadCache(attrs utils.AttrReloadCache, reply *string) err
func (self *ApierV1) GetCacheStats(attrs utils.AttrCacheStats, reply *utils.CacheStats) error {
cs := new(utils.CacheStats)
cs.Destinations = cache2go.CountEntries(utils.DESTINATION_PREFIX)
cs.RatingPlans = cache2go.CountEntries(utils.RATING_PLAN_PREFIX)
cs.RatingProfiles = cache2go.CountEntries(utils.RATING_PROFILE_PREFIX)
cs.Actions = cache2go.CountEntries(utils.ACTION_PREFIX)
cs.ActionPlans = cache2go.CountEntries(utils.ACTION_PLAN_PREFIX)
cs.SharedGroups = cache2go.CountEntries(utils.SHARED_GROUP_PREFIX)
cs.DerivedChargers = cache2go.CountEntries(utils.DERIVEDCHARGERS_PREFIX)
cs.LcrProfiles = cache2go.CountEntries(utils.LCR_PREFIX)
cs.Aliases = cache2go.CountEntries(utils.ALIASES_PREFIX)
cs.Destinations = engine.CacheCountEntries(utils.DESTINATION_PREFIX)
cs.RatingPlans = engine.CacheCountEntries(utils.RATING_PLAN_PREFIX)
cs.RatingProfiles = engine.CacheCountEntries(utils.RATING_PROFILE_PREFIX)
cs.Actions = engine.CacheCountEntries(utils.ACTION_PREFIX)
cs.ActionPlans = engine.CacheCountEntries(utils.ACTION_PLAN_PREFIX)
cs.SharedGroups = engine.CacheCountEntries(utils.SHARED_GROUP_PREFIX)
cs.DerivedChargers = engine.CacheCountEntries(utils.DERIVEDCHARGERS_PREFIX)
cs.LcrProfiles = engine.CacheCountEntries(utils.LCR_PREFIX)
cs.Aliases = engine.CacheCountEntries(utils.ALIASES_PREFIX)
if self.CdrStatsSrv != nil {
var queueIds []string
if err := self.CdrStatsSrv.Call("CDRStatsV1.GetQueueIds", 0, &queueIds); err != nil {

3
apier/v1/triggers.go
View File

@@ -1,6 +1,8 @@
package v1
import (
"log"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
@@ -217,6 +219,7 @@ func (self *ApierV1) SetAccountActionTriggers(attr AttrSetAccountActionTriggers,
} else {
return 0, err
}
log.Print("HERE: ", account.ActionTriggers)
for _, at := range account.ActionTriggers {
if (attr.UniqueID == "" || at.UniqueID == attr.UniqueID) &&
(attr.GroupID == "" || at.ID == attr.GroupID) {