uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Added flag for tenant in cgr-loader

Browse Source
This commit is contained in:
nickolasdaniel
2021-07-21 16:24:38 +03:00
committed by Dan Christian Bogos
parent 9da84ddac7
commit 4aaa2311ee
14 changed files with 91 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apier/v1/apier.go
View File

@@ -332,7 +332,7 @@ func (apierSv1 *APIerSv1) LoadRatingProfile(attrs *utils.TPRatingProfile, reply
if err := apierSv1.DataManager.SetLoadIDs(map[string]int64{utils.CacheRatingProfiles: time.Now().UnixNano()}); err != nil {
return utils.APIErrorHandler(err)
}
if err = dbReader.ReloadCache(config.CgrConfig().GeneralCfg().DefaultCaching, true, make(map[string]interface{})); err != nil {
if err = dbReader.ReloadCache(config.CgrConfig().GeneralCfg().DefaultCaching, true, make(map[string]interface{}), attrs.Tenant); err != nil {
return utils.NewErrServerError(err)
}
*reply = utils.OK
@@ -406,7 +406,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromStorDb(attrs *AttrLoadTpFromStorDb,
}
// reload cache
utils.Logger.Info("APIerSv1.LoadTariffPlanFromStorDb, reloading cache.")
if err := dbReader.ReloadCache(caching, true, attrs.APIOpts); err != nil {
if err := dbReader.ReloadCache(caching, true, attrs.APIOpts, apierSv1.Config.GeneralCfg().DefaultTenant); err != nil {
return utils.NewErrServerError(err)
}
if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 {
@@ -1088,7 +1088,7 @@ func (apierSv1 *APIerSv1) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFo
}
// reload cache
utils.Logger.Info("APIerSv1.LoadTariffPlanFromFolder, reloading cache.")
if err := loader.ReloadCache(caching, true, attrs.APIOpts); err != nil {
if err := loader.ReloadCache(caching, true, attrs.APIOpts, apierSv1.Config.GeneralCfg().DefaultTenant); err != nil {
return utils.NewErrServerError(err)
}
if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 {
@@ -1154,7 +1154,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromFolder(attrs *utils.AttrLoadTpFromFolder,
}
// reload cache
utils.Logger.Info("APIerSv1.RemoveTPFromFolder, reloading cache.")
if err := loader.ReloadCache(caching, true, attrs.APIOpts); err != nil {
if err := loader.ReloadCache(caching, true, attrs.APIOpts, apierSv1.Config.GeneralCfg().DefaultTenant); err != nil {
return utils.NewErrServerError(err)
}
if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 {
@@ -1206,7 +1206,7 @@ func (apierSv1 *APIerSv1) RemoveTPFromStorDB(attrs *AttrLoadTpFromStorDb, reply
}
// reload cache
utils.Logger.Info("APIerSv1.RemoveTPFromStorDB, reloading cache.")
if err := dbReader.ReloadCache(caching, true, attrs.APIOpts); err != nil {
if err := dbReader.ReloadCache(caching, true, attrs.APIOpts, apierSv1.Config.GeneralCfg().DefaultTenant); err != nil {
return utils.NewErrServerError(err)
}
if len(apierSv1.Config.ApierCfg().SchedulerConns) != 0 {

4
apier/v2/apier.go
View File

@@ -67,7 +67,7 @@ func (apiv2 *APIerSv2) LoadRatingProfile(attrs *AttrLoadRatingProfile, reply *st
if err := apiv2.DataManager.SetLoadIDs(map[string]int64{utils.CacheRatingProfiles: time.Now().UnixNano()}); err != nil {
return utils.APIErrorHandler(err)
}
if err = dbReader.ReloadCache(config.CgrConfig().GeneralCfg().DefaultCaching, true, make(map[string]interface{})); err != nil {
if err = dbReader.ReloadCache(config.CgrConfig().GeneralCfg().DefaultCaching, true, make(map[string]interface{}), apiv2.Config.GeneralCfg().DefaultTenant); err != nil {
return utils.NewErrServerError(err)
}
*reply = utils.OK
@@ -149,7 +149,7 @@ func (apiv2 *APIerSv2) LoadTariffPlanFromFolder(attrs *utils.AttrLoadTpFromFolde
if attrs.Caching != nil {
caching = *attrs.Caching
}
if err := loader.ReloadCache(caching, true, attrs.APIOpts); err != nil {
if err := loader.ReloadCache(caching, true, attrs.APIOpts, apiv2.Config.GeneralCfg().DefaultTimezone); err != nil {
return utils.NewErrServerError(err)
}
if len(apiv2.Config.ApierCfg().SchedulerConns) != 0 {