From e802e1eee768dd35c9c71ba323a47a70b38f59fb Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Tue, 16 Jun 2015 21:27:42 +0300 Subject: [PATCH] fixed more local tests --- apier/v1/aliases.go | 2 +- apier/v1/apier.go | 2 +- engine/loader_local_test.go | 1 + engine/storage_redis.go | 7 +++---- engine/tp_reader.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apier/v1/aliases.go b/apier/v1/aliases.go index 04d743543..962949105 100644 --- a/apier/v1/aliases.go +++ b/apier/v1/aliases.go @@ -45,7 +45,7 @@ func (self *ApierV1) AddRatingSubjectAliases(attrs AttrAddRatingSubjectAliases, } aliasesChanged = append(aliasesChanged, utils.RP_ALIAS_PREFIX+utils.RatingSubjectAliasKey(attrs.Tenant, alias)) } - if err := self.RatingDb.CachePrefixes(utils.ACC_ALIAS_PREFIX); err != nil { + if err := self.RatingDb.CachePrefixes(utils.RP_ALIAS_PREFIX); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 742ad6cf3..acabc2dda 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -825,7 +825,7 @@ func (self *ApierV1) LoadAccountActions(attrs utils.TPAccountActions, reply *str } // ToDo: Get the action keys loaded by dbReader so we reload only these in cache // Need to do it before scheduler otherwise actions to run will be unknown - if err := self.RatingDb.CachePrefixes(utils.DERIVED_CHARGERS_CSV, utils.ACTION_PREFIX, utils.SHARED_GROUP_PREFIX, utils.ACC_ALIAS_PREFIX); err != nil { + if err := self.RatingDb.CachePrefixes(utils.DERIVEDCHARGERS_PREFIX, utils.ACTION_PREFIX, utils.SHARED_GROUP_PREFIX, utils.ACC_ALIAS_PREFIX); err != nil { return err } if self.Sched != nil { diff --git a/engine/loader_local_test.go b/engine/loader_local_test.go index e95407b81..877345b00 100644 --- a/engine/loader_local_test.go +++ b/engine/loader_local_test.go @@ -308,6 +308,7 @@ func TestLoadIndividualProfiles(t *testing.T) { for aaId := range aas { aa, _ := utils.NewTPAccountActionsFromKeyId(utils.TEST_SQL, loadId, aaId) maa := APItoModelAccountAction(aa) + if err := loader.LoadAccountActionsFiltered(maa); err != nil { t.Fatalf("Could not load account actions with id: %s, error: %s", aaId, err.Error()) } diff --git a/engine/storage_redis.go b/engine/storage_redis.go index 95487c220..879500d2a 100644 --- a/engine/storage_redis.go +++ b/engine/storage_redis.go @@ -98,10 +98,9 @@ func (rs *RedisStorage) CachePrefixValues(prefixes map[string][]string) error { utils.RATING_PROFILE_PREFIX: []string{}, utils.RP_ALIAS_PREFIX: []string{}, utils.LCR_PREFIX: []string{}, - utils.DERIVEDCHARGERS_PREFIX: []string{}, - utils.ACTION_PREFIX: []string{}, - utils.SHARED_GROUP_PREFIX: []string{}, - utils.ACC_ALIAS_PREFIX: []string{}, + utils.DERIVEDCHARGERS_PREFIX: []string{}, utils.ACTION_PREFIX: []string{}, + utils.SHARED_GROUP_PREFIX: []string{}, + utils.ACC_ALIAS_PREFIX: []string{}, } for prefix, ids := range prefixes { if _, found := pm[prefix]; !found { diff --git a/engine/tp_reader.go b/engine/tp_reader.go index fc538b7dd..0a10998c5 100644 --- a/engine/tp_reader.go +++ b/engine/tp_reader.go @@ -814,7 +814,7 @@ func (tpr *TpReader) LoadAccountActionsFiltered(qriedAA *TpAccountAction) error acts[tag] = enacts } } - // writee actions + // write actions for k, as := range acts { err = tpr.ratingStorage.SetActions(k, as) if err != nil {