From ea2b5303f2ee4e7900d455fabe4398bd87adc1a3 Mon Sep 17 00:00:00 2001 From: TeoV Date: Fri, 22 Jun 2018 11:42:27 -0400 Subject: [PATCH] Cgr-loader now clear indexing --- apier/v1/caches.go | 2 +- cmd/cgr-loader/cgr-loader.go | 22 ++++++++++++++++++++++ engine/tp_reader.go | 1 + sessions/sessions.go | 2 +- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/apier/v1/caches.go b/apier/v1/caches.go index 29e0d70cb..9c7cb6922 100644 --- a/apier/v1/caches.go +++ b/apier/v1/caches.go @@ -59,7 +59,7 @@ func (chSv1 *CacheSv1) RemoveItem(args *engine.ArgsGetCacheItem, return chSv1.cacheS.V1RemoveItem(args, reply) } -// Clear will clear partitions in the cache (all for nil, none for empty slice) +// Clear will clear partitions in the cache (nil fol all, empty slice for none) func (chSv1 *CacheSv1) Clear(cacheIDs []string, reply *string) error { return chSv1.cacheS.V1Clear(cacheIDs, reply) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index a27a4c530..4b46875a9 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -398,6 +398,28 @@ func main() { }, &reply); err != nil { log.Printf("WARNING: Got error on cache reload: %s\n", err.Error()) } + var cacheIDs []string + if len(apfIDs) != 0 { + cacheIDs = append(cacheIDs, utils.CacheSupplierFilterIndexes, utils.CacheAttributeFilterRevIndexes) + } + if len(spfIDs) != 0 { + cacheIDs = append(cacheIDs, utils.CacheAttributeFilterIndexes, utils.CacheSupplierFilterRevIndexes) + } + if len(trspfIDs) != 0 { + cacheIDs = append(cacheIDs, utils.CacheThresholdFilterIndexes, utils.CacheThresholdFilterRevIndexes) + } + if len(stqpIDs) != 0 { + cacheIDs = append(cacheIDs, utils.CacheStatFilterIndexes, utils.CacheStatFilterRevIndexes) + } + if len(rspIDs) != 0 { + cacheIDs = append(cacheIDs, utils.CacheResourceFilterIndexes, utils.CacheResourceFilterRevIndexes) + } + if *verbose { + log.Print("Clearing cached indexes") + } + if err = cacheS.Call(utils.CacheSv1Clear, cacheIDs, &reply); err != nil { + log.Printf("WARNING: Got error on cache clear: %s\n", err.Error()) + } if len(aps) != 0 { if *verbose { diff --git a/engine/tp_reader.go b/engine/tp_reader.go index ec61e9533..6e12f0efe 100644 --- a/engine/tp_reader.go +++ b/engine/tp_reader.go @@ -2162,6 +2162,7 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose, disable_reverse bool) (err log.Print("AttributeProfiles:") } for _, tpTH := range tpr.attributeProfiles { + th, err := APItoAttributeProfile(tpTH, tpr.timezone) if err != nil { return err diff --git a/sessions/sessions.go b/sessions/sessions.go index f54ddd960..8ab4e4946 100644 --- a/sessions/sessions.go +++ b/sessions/sessions.go @@ -2044,7 +2044,7 @@ func (smg *SMGeneric) syncSessions() { if err := conn.Call(utils.SessionSv1GetActiveSessionIDs, "", &queriedSessionIDs); err != nil { utils.Logger.Warning( - fmt.Sprintf("error quering session ids : %+v", err)) + fmt.Sprintf("<%s> error quering session ids : %+v", utils.SessionS, err)) continue } for _, sessionID := range queriedSessionIDs {