From f3677f1042db747aa6e52a05090b881d5ac882a8 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Thu, 19 Feb 2026 01:35:11 +0200 Subject: [PATCH] add connMgr field to TpReader --- cmd/cgr-loader/cgr-loader.go | 4 ++-- engine/libtest.go | 2 +- engine/loader_csv_test.go | 2 +- engine/tpreader.go | 6 ++++-- engine/tpreader_test.go | 5 +++-- engine/z_loader_it_test.go | 4 ++-- 6 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 5e48d9a86..d50396bb8 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -315,7 +315,7 @@ func main() { ldrCfg := loadConfig() // we initialize connManager here with nil for InternalChannels - engine.NewConnManager(ldrCfg) + cM := engine.NewConnManager(ldrCfg) if dataDB, err = engine.NewDataDBConn(ldrCfg.DbCfg().DBConns[utils.MetaDefault].Type, ldrCfg.DbCfg().DBConns[utils.MetaDefault].Host, @@ -340,7 +340,7 @@ func main() { if tpReader, err = engine.NewTpReader(dbcManager, loader, ldrCfg.LoaderCgrCfg().TpID, ldrCfg.GeneralCfg().DefaultTimezone, ldrCfg.LoaderCgrCfg().CachesConns, - ldrCfg.LoaderCgrCfg().ActionSConns); err != nil { + ldrCfg.LoaderCgrCfg().ActionSConns, cM); err != nil { log.Fatal(err) } if err = tpReader.LoadAll(); err != nil { diff --git a/engine/libtest.go b/engine/libtest.go index 0654a0faf..cecaa337c 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -200,7 +200,7 @@ func LoadTariffPlanFromFolder(tpPath, timezone string, dm *DataManager, disableR } dbcManager := NewDBConnManager(dataDBs, dm.cfg.DbCfg()) loader, err := NewTpReader(dbcManager, csvStorage, "", - timezone, cacheConns, schedConns) + timezone, cacheConns, schedConns, nil) if err != nil { return utils.NewErrServerError(err) } diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index 686b009fe..cdfb4c02f 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -183,7 +183,7 @@ cgrates.org,1001,,,,,VoiceBalance,,;10,*string:~*req.Destination:1002;true;;fals csvr, err := NewTpReader(dbCM, NewStringCSVStorage(utils.CSVSep, ResourcesCSVContent, IPCSVContent, StatsCSVContent, RankingsCSVContent, TrendsCSVContent, ThresholdsCSVContent, FiltersCSVContent, RoutesCSVContent, AttributesCSVContent, ChargersCSVContent, DispatcherCSVContent, - DispatcherHostCSVContent, RateProfileCSVContent, ActionProfileCSVContent, AccountCSVContent), testTPID, "", nil, nil) + DispatcherHostCSVContent, RateProfileCSVContent, ActionProfileCSVContent, AccountCSVContent), testTPID, "", nil, nil, nil) if err != nil { log.Print("error when creating TpReader:", err) } diff --git a/engine/tpreader.go b/engine/tpreader.go index a29cee1a5..afcebabe6 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -34,6 +34,7 @@ type TpReader struct { timezone string dm *DataManager lr LoadReader + connMgr *ConnManager resProfiles map[utils.TenantID]*utils.TPResourceProfile sqProfiles map[utils.TenantID]*utils.TPStatProfile ipProfiles map[utils.TenantID]*utils.TPIPProfile @@ -52,12 +53,13 @@ type TpReader struct { } func NewTpReader(db *DBConnManager, lr LoadReader, tpid, timezone string, - cacheConns, schedulerConns []string) (*TpReader, error) { + cacheConns, schedulerConns []string, connMgr *ConnManager) (*TpReader, error) { tpr := &TpReader{ tpid: tpid, timezone: timezone, dm: NewDataManager(db, config.CgrConfig(), connMgr), // ToDo: add CGRConfig as parameter to the NewTpReader lr: lr, + connMgr: connMgr, cacheConns: cacheConns, //schedulerConns: schedulerConns, } @@ -1046,7 +1048,7 @@ func (tpr *TpReader) ReloadCache(ctx *context.Context, caching string, verbose b cacheIDs = append(cacheIDs, utils.CacheReverseFilterIndexes) } - if err = CallCache(connMgr, ctx, tpr.cacheConns, caching, cacheArgs, cacheIDs, opts, verbose, tenant); err != nil { + if err = CallCache(tpr.connMgr, ctx, tpr.cacheConns, caching, cacheArgs, cacheIDs, opts, verbose, tenant); err != nil { return } //get loadIDs for all types diff --git a/engine/tpreader_test.go b/engine/tpreader_test.go index dd3bf2833..5ed986b55 100644 --- a/engine/tpreader_test.go +++ b/engine/tpreader_test.go @@ -648,6 +648,7 @@ func TestTPReaderReloadCache(t *testing.T) { {Tenant: "cgrates.org", ID: "chargerProfilesID"}: {}, }, dm: NewDataManager(dbCM, cfg, cnMgr), + connMgr: cnMgr, cacheConns: []string{connID}, } if err := tpr.ReloadCache(context.Background(), utils.MetaReload, false, make(map[string]any), "cgrates.org"); err != nil { @@ -660,11 +661,11 @@ func TestTpReaderLoadAll(t *testing.T) { storeCSV := &CSVStorage{} db, _ := NewInternalDB(nil, nil, nil, cfg.DbCfg().Items) dbCM := NewDBConnManager(map[string]DataDB{utils.MetaDefault: db}, cfg.DbCfg()) - tpr, err := NewTpReader(dbCM, storeCSV, "", "", nil, nil) + tpr, err := NewTpReader(dbCM, storeCSV, "", "", nil, nil, nil) if err != nil { t.Error(err) } - tprCopy, err := NewTpReader(dbCM, storeCSV, "", "", nil, nil) + tprCopy, err := NewTpReader(dbCM, storeCSV, "", "", nil, nil, nil) if err != nil { t.Error(err) } diff --git a/engine/z_loader_it_test.go b/engine/z_loader_it_test.go index c504b633a..c4732a66d 100644 --- a/engine/z_loader_it_test.go +++ b/engine/z_loader_it_test.go @@ -131,7 +131,7 @@ func testLoaderITRemoveLoad(t *testing.T) { } dbCM := NewDBConnManager(dataDbCsv.DataDB(), lCfg.DbCfg()) loader, err = NewTpReader(dbCM, csvStorage, "", "", - []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil) + []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, connMgr) if err != nil { t.Error(err) } @@ -178,7 +178,7 @@ func testLoaderITLoadFromCSV(t *testing.T) { } dbCM := NewDBConnManager(dataDbCsv.DataDB(), lCfg.DbCfg()) loader, err = NewTpReader(dbCM, csvStorage, "", "", - []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil) + []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, nil, connMgr) if err != nil { t.Error(err) }