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

PreloadCache -> LoadCache

Browse Source
This commit is contained in:
DanB
2016-12-27 18:22:11 +01:00
parent e5f8a4147b
commit a9b10b7f65
25 changed files with 146 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
cmd/cgr-engine/rater.go
View File

@@ -69,13 +69,52 @@ func startRater(internalRaterChan chan rpcclient.RpcClientConnection, cacheDoneC
cacheDoneChan <- struct{}{}
return
}
if err := ratingDb.PreloadRatingCache(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil); err != nil {
var dstIDs, rvDstIDs, rplIDs, rpfIDs, actIDs, aplIDs, atrgIDs, sgIDs, lcrIDs, dcIDs, alsIDs, rvAlsIDs, rlIDs []string
if cfg.CacheConfig.Destinations.Precache {
dstIDs = nil // Precache all
}
if cfg.CacheConfig.ReverseDestinations.Precache {
rvDstIDs = nil
}
if cfg.CacheConfig.RatingPlans.Precache {
rplIDs = nil
}
if cfg.CacheConfig.RatingProfiles.Precache {
rpfIDs = nil
}
if cfg.CacheConfig.Actions.Precache {
actIDs = nil
}
if cfg.CacheConfig.ActionPlans.Precache {
aplIDs = nil
}
if cfg.CacheConfig.ActionTriggers.Precache {
atrgIDs = nil
}
if cfg.CacheConfig.SharedGroups.Precache {
sgIDs = nil
}
if cfg.CacheConfig.Lcr.Precache {
lcrIDs = nil
}
if cfg.CacheConfig.DerivedChargers.Precache {
dcIDs = nil
}
if cfg.CacheConfig.Aliases.Precache {
alsIDs = nil
}
if cfg.CacheConfig.ReverseAliases.Precache {
rvAlsIDs = nil
}
if cfg.CacheConfig.ResourceLimits.Precache {
rlIDs = nil
}
if err := ratingDb.LoadRatingCache(dstIDs, rvDstIDs, rplIDs, rpfIDs, actIDs, aplIDs, atrgIDs, sgIDs, lcrIDs, dcIDs); err != nil {
utils.Logger.Crit(fmt.Sprintf("<RALs> Cache rating error: %s", err.Error()))
exitChan <- true
return
}
if err := accountDb.PreloadAccountingCache(nil, nil, nil); err != nil {
if err := accountDb.LoadAccountingCache(alsIDs, rvAlsIDs, rlIDs); err != nil {
utils.Logger.Crit(fmt.Sprintf("<RALs> Cache accounting error: %s", err.Error()))
exitChan <- true
return

4
cmd/cgr-tester/cgr-tester.go
View File

@@ -76,10 +76,10 @@ func durInternalRater(cd *engine.CallDescriptor) (time.Duration, error) {
}
defer accountDb.Close()
engine.SetAccountingStorage(accountDb)
if err := ratingDb.PreloadRatingCache(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil); err != nil {
if err := ratingDb.LoadRatingCache(nil, nil, nil, nil, nil, nil, nil, nil, nil, nil); err != nil {
return nilDuration, fmt.Errorf("Cache rating error: %s", err.Error())
}
if err := accountDb.PreloadAccountingCache(nil, nil, nil); err != nil {
if err := accountDb.LoadAccountingCache(nil, nil, nil); err != nil {
return nilDuration, fmt.Errorf("Cache accounting error: %s", err.Error())
}
log.Printf("Runnning %d cycles...", *runs)