From f8a998600b6deea3731da047aceb49525a48a208 Mon Sep 17 00:00:00 2001 From: DanB Date: Sun, 7 Aug 2016 17:00:14 +0200 Subject: [PATCH] Model converters, instantiate Usage on resourceLimit --- config/config_defaults.go | 4 ++-- engine/model_converters.go | 2 +- engine/model_converters_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/config_defaults.go b/config/config_defaults.go index 50ee0db7f..0cddbd957 100644 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -386,8 +386,8 @@ const CGRATES_CFG_JSON = ` "rls": { "enabled": false, // starts ResourceLimiter service: . "cdrstats_conns": [], // address where to reach the cdrstats service, empty to disable stats functionality: <""|*internal|x.y.z.y:1234> - "cache_dump_interval": "0s", // dump cache regularly to dataDB, 0 - dump at start/shutdown: <""|*never|dur> - "usage_ttl": "3h", // expire usage records if older than this duration <""|*never|dur> + "cache_dump_interval": "0s", // dump cache regularly to dataDB, 0 - dump at start/shutdown: <""|*never|$dur> + "usage_ttl": "3h", // expire usage records if older than this duration <""|*never|$dur> }, diff --git a/engine/model_converters.go b/engine/model_converters.go index e869ba856..72beeb563 100644 --- a/engine/model_converters.go +++ b/engine/model_converters.go @@ -411,7 +411,7 @@ func APItoModelUsers(attr *utils.TPUsers) (result []TpUser) { } func APItoResourceLimit(tpRL *utils.TPResourceLimit, timezone string) (rl *ResourceLimit, err error) { - rl = &ResourceLimit{ID: tpRL.ID, Weight: tpRL.Weight, Filters: make([]*RequestFilter, len(tpRL.Filters))} + rl = &ResourceLimit{ID: tpRL.ID, Weight: tpRL.Weight, Filters: make([]*RequestFilter, len(tpRL.Filters)), Usage: make(map[string]*ResourceUsage)} for i, tpFltr := range tpRL.Filters { rf := &RequestFilter{Type: tpFltr.Type, FieldName: tpFltr.FieldName, Values: tpFltr.Values} if err := rf.CompileValues(); err != nil { diff --git a/engine/model_converters_test.go b/engine/model_converters_test.go index e40fe695a..83dff5449 100644 --- a/engine/model_converters_test.go +++ b/engine/model_converters_test.go @@ -21,7 +21,7 @@ func TestAPItoResourceLimit(t *testing.T) { Weight: 10, Limit: "2", } - eRL := &ResourceLimit{ID: tpRL.ID, Weight: tpRL.Weight, Filters: make([]*RequestFilter, len(tpRL.Filters))} + eRL := &ResourceLimit{ID: tpRL.ID, Weight: tpRL.Weight, Filters: make([]*RequestFilter, len(tpRL.Filters)), Usage: make(map[string]*ResourceUsage)} eRL.Filters[0] = &RequestFilter{Type: MetaString, FieldName: "Account", Values: []string{"1001", "1002"}} eRL.Filters[1] = &RequestFilter{Type: MetaStringPrefix, FieldName: "Destination", Values: []string{"10", "20"}} eRL.Filters[2] = &RequestFilter{Type: MetaCDRStats, Values: []string{"CDRST1:*min_ASR:34", "CDRST_1001:*min_ASR:20"},