From 472d036d15dc1cd9b24fe1992ed2de20099dfede Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 25 Nov 2013 16:32:24 +0100 Subject: [PATCH] Reverting to individual TPRatePlan load --- engine/loader_db.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/engine/loader_db.go b/engine/loader_db.go index 6aa919dba..6162394f4 100644 --- a/engine/loader_db.go +++ b/engine/loader_db.go @@ -313,15 +313,11 @@ func (dbr *DbReader) LoadRatingProfileFiltered(qriedRpf *utils.TPRatingProfile) return errors.New(fmt.Sprintf("Cannot parse activation time from %v", tpRa.ActivationTime)) } _, exists := dbr.ratingPlans[tpRa.RatingPlanId] - if !exists { // Try loading locally, on errrors, give up - if loaded, err := dbr.LoadRatingPlanByTag(tpRa.RatingPlanId); err != nil { + if !exists { + if dbExists, err := dbr.dataDb.ExistsData(RATING_PLAN_PREFIX, tpRa.RatingPlanId); err != nil { return err - } else if !loaded { // Not found - if dbExists, err := dbr.dataDb.ExistsData(RATING_PLAN_PREFIX, tpRa.RatingPlanId); err != nil { - return err - } else if !dbExists { - return errors.New(fmt.Sprintf("Could not load rating plans for tag: %v", tpRa.RatingPlanId)) - } + } else if !dbExists { + return errors.New(fmt.Sprintf("Could not load rating plans for tag: %v", tpRa.RatingPlanId)) } } resultRatingProfile.RatingPlanActivations = append(resultRatingProfile.RatingPlanActivations,