diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 5c135f15e..320b88e45 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -364,7 +364,7 @@ func (apiv1 *APIerSv1) LoadTariffPlanFromStorDb(attrs AttrLoadTpFromStorDb, repl } // reload cache utils.Logger.Info("APIerSv1.LoadTariffPlanFromStorDb, reloading cache.") - if err := dbReader.ReloadCache(caching, true, attrs.ArgDispatcher); err != nil { + if err := dbReader.ReloadCache(caching, true, attrs.ArgDispatcher, apiv1.Config.GeneralCfg().DefaultTenant); err != nil { return utils.NewErrServerError(err) } if len(apiv1.Config.ApierCfg().SchedulerConns) != 0 { @@ -919,7 +919,7 @@ func (apiv1 *APIerSv1) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder } // reload cache utils.Logger.Info("APIerSv1.LoadTariffPlanFromFolder, reloading cache.") - if err := loader.ReloadCache(caching, true, attrs.ArgDispatcher); err != nil { + if err := loader.ReloadCache(caching, true, attrs.ArgDispatcher, apiv1.Config.GeneralCfg().DefaultTenant); err != nil { return utils.NewErrServerError(err) } if len(apiv1.Config.ApierCfg().SchedulerConns) != 0 { @@ -984,7 +984,7 @@ func (apiv1 *APIerSv1) RemoveTPFromFolder(attrs utils.AttrLoadTpFromFolder, repl } // reload cache utils.Logger.Info("APIerSv1.RemoveTPFromFolder, reloading cache.") - if err := loader.ReloadCache(caching, true, attrs.ArgDispatcher); err != nil { + if err := loader.ReloadCache(caching, true, attrs.ArgDispatcher, apiv1.Config.GeneralCfg().DefaultTenant); err != nil { return utils.NewErrServerError(err) } if len(apiv1.Config.ApierCfg().SchedulerConns) != 0 { @@ -1035,7 +1035,7 @@ func (apiv1 *APIerSv1) RemoveTPFromStorDB(attrs AttrLoadTpFromStorDb, reply *str } // reload cache utils.Logger.Info("APIerSv1.RemoveTPFromStorDB, reloading cache.") - if err := dbReader.ReloadCache(caching, true, attrs.ArgDispatcher); err != nil { + if err := dbReader.ReloadCache(caching, true, attrs.ArgDispatcher, apiv1.Config.GeneralCfg().DefaultTenant); err != nil { return utils.NewErrServerError(err) } if len(apiv1.Config.ApierCfg().SchedulerConns) != 0 { diff --git a/apier/v2/apier.go b/apier/v2/apier.go index a3fb072fc..76239d2f1 100644 --- a/apier/v2/apier.go +++ b/apier/v2/apier.go @@ -140,7 +140,7 @@ func (apiv2 *APIerSv2) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder if attrs.Caching != nil { caching = *attrs.Caching } - if err := loader.ReloadCache(caching, true, attrs.ArgDispatcher); err != nil { + if err := loader.ReloadCache(caching, true, attrs.ArgDispatcher, apiv2.Config.GeneralCfg().DefaultTenant); err != nil { return utils.NewErrServerError(err) } if len(apiv2.Config.ApierCfg().SchedulerConns) != 0 { diff --git a/cmd/cgr-loader/cgr-loader.go b/cmd/cgr-loader/cgr-loader.go index 8ee845a66..f4675d01b 100755 --- a/cmd/cgr-loader/cgr-loader.go +++ b/cmd/cgr-loader/cgr-loader.go @@ -95,6 +95,7 @@ var ( remove = cgrLoaderFlags.Bool("remove", false, "Will remove instead of adding data from DB") apiKey = cgrLoaderFlags.String("api_key", "", "Api Key used to comosed ArgDispatcher") routeID = cgrLoaderFlags.String("route_id", "", "RouteID used to comosed ArgDispatcher") + tenant = cgrLoaderFlags.String(utils.TenantCfg, dfltCfg.GeneralCfg().DefaultTenant, "") fromStorDB = cgrLoaderFlags.Bool("from_stordb", false, "Load the tariff plan from storDb to dataDb") toStorDB = cgrLoaderFlags.Bool("to_stordb", false, "Import the tariff plan from files to storDb") @@ -339,7 +340,7 @@ func main() { if err := tpReader.ReloadCache(caching, *verbose, &utils.ArgDispatcher{ APIKey: apiKey, RouteID: routeID, - }); err != nil { + }, *tenant); err != nil { log.Fatal("Could not reload cache: ", err) } if len(ldrCfg.LoaderCgrCfg().SchedulerConns) != 0 { diff --git a/engine/tpreader.go b/engine/tpreader.go index 59e620cfc..639438381 100644 --- a/engine/tpreader.go +++ b/engine/tpreader.go @@ -2373,7 +2373,7 @@ func (tpr *TpReader) RemoveFromDatabase(verbose, disable_reverse bool) (err erro return } -func (tpr *TpReader) ReloadCache(caching string, verbose bool, argDispatcher *utils.ArgDispatcher) (err error) { +func (tpr *TpReader) ReloadCache(caching string, verbose bool, argDispatcher *utils.ArgDispatcher, tenant string) (err error) { if len(tpr.cacheConns) == 0 { log.Print("Disabled automatic reload") return @@ -2488,7 +2488,7 @@ func (tpr *TpReader) ReloadCache(caching string, verbose bool, argDispatcher *ut } clearArgs := &utils.AttrCacheIDsWithArgDispatcher{ TenantArg: utils.TenantArg{ - Tenant: config.CgrConfig().GeneralCfg().DefaultTenant, + Tenant: tenant, }, ArgDispatcher: argDispatcher, CacheIDs: cacheIDs,