From 6042f45d5efe4f709a4cee88fde4fd644f07fc7b Mon Sep 17 00:00:00 2001 From: DanB Date: Fri, 3 Nov 2017 13:21:01 +0100 Subject: [PATCH] CacheS in engine, config cache exporting update --- cmd/cgr-engine/rater.go | 2 +- cmd/cgr-migrator/cgr-migrator.go | 3 ++- engine/libtest.go | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmd/cgr-engine/rater.go b/cmd/cgr-engine/rater.go index 653193c50..cf0b5b21b 100755 --- a/cmd/cgr-engine/rater.go +++ b/cmd/cgr-engine/rater.go @@ -44,7 +44,7 @@ func startRater(internalRaterChan chan rpcclient.RpcClientConnection, cacheDoneC go func() { defer close(cacheTaskChan) var dstIDs, rvDstIDs, rplIDs, rpfIDs, actIDs, aplIDs, aapIDs, atrgIDs, sgIDs, lcrIDs, dcIDs, alsIDs, rvAlsIDs, rspIDs, resIDs, stqIDs, stqpIDs, thIDs, thpIDs, fltrIDs, lcrPrfIDs []string - if cCfg, has := ccacheCfg[utils.CacheDestinations]; !has || !cCfg.Precache { + if cCfg, has := cacheCfg[utils.CacheDestinations]; !has || !cCfg.Precache { dstIDs = make([]string, 0) // Don't cache any } if cCfg, has := cacheCfg[utils.CacheReverseDestinations]; !has || !cCfg.Precache { diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index 80f5b2b89..6b99f6a9b 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -66,7 +66,7 @@ var ( inStorDBUser = flag.String("stordb_user", config.CgrConfig().StorDBUser, "The storDb user to sign in as.") inStorDBPass = flag.String("stordb_passwd", config.CgrConfig().StorDBPass, "The storDb user's password.") - loadHistorySize = flag.Int("load_history_size", config.CgrConfig().LoadHistorySize, "Limit the number of records in the load history") + loadHistorySize = flag.Int("load_history_size", config.CgrConfig().LoadHistorySize, "Limit the number of records in the load history") dbDataEncoding = flag.String("dbData_encoding", config.CgrConfig().DBDataEncoding, "The encoding used to store object Data in strings") inDBDataEncoding = flag.String("in_dbData_encoding", "", "The encoding used to store object Data in strings") @@ -86,6 +86,7 @@ func main() { log.Print("Initializing DataDB:", *outDataDBType) log.Print("Initializing storDB:", *outStorDBType) } + var dmOUT *engine.DataManager dmOUT, _ = engine.ConfigureDataStorage(*outDataDBType, *outDataDBHost, *outDataDBPort, *outDataDBName, *outDataDBUser, *outDataDBPass, *dbDataEncoding, config.CgrConfig().CacheCfg(), *loadHistorySize) storDB, err := engine.ConfigureStorStorage(*outStorDBType, *outStorDBHost, *outStorDBPort, *outStorDBName, *outStorDBUser, *outStorDBPass, *dbDataEncoding, diff --git a/engine/libtest.go b/engine/libtest.go index 31dc28216..9664aedc9 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -34,7 +34,8 @@ import ( ) func InitDataDb(cfg *config.CGRConfig) error { - dm, err := ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, cfg.DataDbName, cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding, cfg.CacheCfg(), cfg.LoadHistorySize) + dm, err := ConfigureDataStorage(cfg.DataDbType, cfg.DataDbHost, cfg.DataDbPort, cfg.DataDbName, + cfg.DataDbUser, cfg.DataDbPass, cfg.DBDataEncoding, cfg.CacheCfg(), cfg.LoadHistorySize) if err != nil { return err }