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

normal test passing

Browse Source
This commit is contained in:
Radu Ioan Fericean
2015-06-16 19:45:01 +03:00
parent 61d9919df6
commit fcb5fee2fc
51 changed files with 924 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/cgr-engine/cgr-engine.go
View File

@@ -76,16 +76,11 @@ var (
)
func cacheData(ratingDb engine.RatingStorage, accountDb engine.AccountingStorage, doneChan chan struct{}) {
if err := ratingDb.CacheRating(nil, nil, nil, nil, nil, nil); err != nil {
if err := ratingDb.CacheAll(); err != nil {
engine.Logger.Crit(fmt.Sprintf("Cache rating error: %s", err.Error()))
exitChan <- true
return
}
if err := accountDb.CacheAccounting(nil, nil, nil); err != nil {
engine.Logger.Crit(fmt.Sprintf("Cache accounting error: %s", err.Error()))
exitChan <- true
return
}
close(doneChan)
}
@@ -568,10 +563,10 @@ func main() {
engine.Logger.Info("Starting CGRateS Scheduler.")
go func() {
sched := scheduler.NewScheduler()
go reloadSchedulerSingnalHandler(sched, accountDb)
go reloadSchedulerSingnalHandler(sched, ratingDb)
apierRpcV1.Sched = sched
apierRpcV2.Sched = sched
sched.LoadActionPlans(accountDb)
sched.LoadActionPlans(ratingDb)
sched.Loop()
}()
}

2
cmd/cgr-engine/registration.go
View File

@@ -104,7 +104,7 @@ func registerToBalancer() {
}
// Listens for the HUP system signal and gracefuly reloads the timers from database.
func reloadSchedulerSingnalHandler(sched *scheduler.Scheduler, getter engine.AccountingStorage) {
func reloadSchedulerSingnalHandler(sched *scheduler.Scheduler, getter engine.RatingStorage) {
for {
c := make(chan os.Signal)
signal.Notify(c, syscall.SIGHUP)

22
cmd/cgr-loader/cgr-loader.go
View File

@@ -216,15 +216,15 @@ func main() {
// Reload scheduler and cache
if rater != nil {
reply := ""
dstIds, _ := tpReader.GetLoadedIds(engine.DESTINATION_PREFIX)
rplIds, _ := tpReader.GetLoadedIds(engine.RATING_PLAN_PREFIX)
rpfIds, _ := tpReader.GetLoadedIds(engine.RATING_PROFILE_PREFIX)
actIds, _ := tpReader.GetLoadedIds(engine.ACTION_PREFIX)
shgIds, _ := tpReader.GetLoadedIds(engine.SHARED_GROUP_PREFIX)
rpAliases, _ := tpReader.GetLoadedIds(engine.RP_ALIAS_PREFIX)
accAliases, _ := tpReader.GetLoadedIds(engine.ACC_ALIAS_PREFIX)
lcrIds, _ := tpReader.GetLoadedIds(engine.LCR_PREFIX)
dcs, _ := tpReader.GetLoadedIds(engine.DERIVEDCHARGERS_PREFIX)
dstIds, _ := tpReader.GetLoadedIds(utils.DESTINATION_PREFIX)
rplIds, _ := tpReader.GetLoadedIds(utils.RATING_PLAN_PREFIX)
rpfIds, _ := tpReader.GetLoadedIds(utils.RATING_PROFILE_PREFIX)
actIds, _ := tpReader.GetLoadedIds(utils.ACTION_PREFIX)
shgIds, _ := tpReader.GetLoadedIds(utils.SHARED_GROUP_PREFIX)
rpAliases, _ := tpReader.GetLoadedIds(utils.RP_ALIAS_PREFIX)
accAliases, _ := tpReader.GetLoadedIds(utils.ACC_ALIAS_PREFIX)
lcrIds, _ := tpReader.GetLoadedIds(utils.LCR_PREFIX)
dcs, _ := tpReader.GetLoadedIds(utils.DERIVEDCHARGERS_PREFIX)
// Reload cache first since actions could be calling info from within
if *verbose {
log.Print("Reloading cache")
@@ -245,7 +245,7 @@ func main() {
}, &reply); err != nil {
log.Printf("WARNING: Got error on cache reload: %s\n", err.Error())
}
actTmgIds, _ := tpReader.GetLoadedIds(engine.ACTION_TIMING_PREFIX)
actTmgIds, _ := tpReader.GetLoadedIds(utils.ACTION_TIMING_PREFIX)
if len(actTmgIds) != 0 {
if *verbose {
log.Print("Reloading scheduler")
@@ -257,7 +257,7 @@ func main() {
}
if cdrstats != nil {
statsQueueIds, _ := tpReader.GetLoadedIds(engine.CDR_STATS_PREFIX)
statsQueueIds, _ := tpReader.GetLoadedIds(utils.CDR_STATS_PREFIX)
if *flush {
statsQueueIds = []string{} // Force reload all
}

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

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