From fef08d8a27072c799ba6fb3d8ff31aafdc3e2596 Mon Sep 17 00:00:00 2001 From: DanB Date: Wed, 27 Nov 2013 14:48:11 +0100 Subject: [PATCH] Fixups loader reload cache order and history logs --- cmd/cgr-loader/cgr-loader.go | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index db6336869..ee7360d7f 100644 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -157,19 +157,30 @@ func main() { if err := loader.WriteToDatabase(*flush, *verbose); err != nil { log.Fatal("Could not write to database: ", err) } + if len(*historyServer)!=0 && *verbose { + log.Print("Wrote history.") + } // Reload scheduler and cache if rater != nil { reply := "" + dstIds, _ := loader.GetLoadedIds(engine.DESTINATION_PREFIX) + rplIds, _ := loader.GetLoadedIds(engine.RATING_PLAN_PREFIX) + // Reload cache first since actions could be calling info from within + if *verbose { + log.Print("Reloading cache") + } + if err = rater.Call("ApierV1.ReloadCache", utils.ApiReloadCache{dstIds, rplIds}, &reply); err != nil { + log.Fatalf("Got error on cache reload: %s", err.Error()) + } actIds, _ := loader.GetLoadedIds(engine.ACTION_TIMING_PREFIX) - if len(actIds) != 0 { // Reload scheduler first since that could take less time + if len(actIds) != 0 { + if *verbose { + log.Print("Reloading scheduler") + } if err = rater.Call("ApierV1.ReloadScheduler", "", &reply); err != nil { log.Fatalf("Got error on scheduler reload: %s", err.Error()) } } - dstIds, _ := loader.GetLoadedIds(engine.DESTINATION_PREFIX) - rplIds, _ := loader.GetLoadedIds(engine.RATING_PLAN_PREFIX) - if err = rater.Call("ApierV1.ReloadCache", utils.ApiReloadCache{dstIds, rplIds}, &reply); err != nil { - log.Fatalf("Got error on cache reload: %s", err.Error()) - } + } }