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

Updated config dataprovider generation on demand

Browse Source
This commit is contained in:
Trial97
2021-02-08 15:01:22 +02:00
committed by Dan Christian Bogos
parent 0a7446bdad
commit 0389c6be11
2 changed files with 89 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
config/config.go
View File

@@ -201,6 +201,8 @@ func newCGRConfig(config []byte) (cfg *CGRConfig, err error) {
cfg.coreSCfg = new(CoreSCfg)
cfg.accountSCfg = new(AccountSCfg)
cfg.cacheDP = make(map[string]utils.MapStorage)
var cgrJSONCfg *CgrJsonCfg
if cgrJSONCfg, err = NewCgrJsonCfgFromBytes(config); err != nil {
return
@@ -229,7 +231,6 @@ func newCGRConfig(config []byte) (cfg *CGRConfig, err error) {
dfltLoaderConfig = cfg.loaderCfg[0].Clone()
dfltRemoteHost = new(RemoteHost)
*dfltRemoteHost = *cfg.rpcConns[utils.MetaLocalHost].Conns[0]
cfg.dp = utils.MapStorage(cfg.AsMapInterface(cfg.generalCfg.RSRSep))
err = cfg.checkConfigSanity()
return
}
@@ -254,7 +255,6 @@ func NewCGRConfigFromPath(path string) (cfg *CGRConfig, err error) {
if err = cfg.loadConfigFromPath(path, []func(*CgrJsonCfg) error{cfg.loadFromJSONCfg}, false); err != nil {
return
}
cfg.dp = utils.MapStorage(cfg.AsMapInterface(cfg.generalCfg.RSRSep))
err = cfg.checkConfigSanity()
return
}
@@ -337,7 +337,8 @@ type CGRConfig struct {
coreSCfg *CoreSCfg // CoreS config
accountSCfg *AccountSCfg // AccountS config
dp utils.DataProvider
cacheDP map[string]utils.MapStorage
cacheDPMux sync.RWMutex
}
var posibleLoaderTypes = utils.NewStringSet([]string{utils.MetaAttributes,
@@ -1600,13 +1601,13 @@ func (cfg *CGRConfig) V1ReloadConfig(args *ReloadArgs, reply *string) (err error
if args.DryRun {
cfgV = cfg.Clone()
}
cfgV.reloadDPCache(args.Section)
if err = cfgV.loadCfgWithLocks(args.Path, args.Section); err != nil {
return
}
// lock all sections
cfgV.rLockSections()
cfgV.dp = utils.MapStorage(cfg.AsMapInterface(cfgV.generalCfg.RSRSep))
err = cfgV.checkConfigSanity()
cfgV.rUnlockSections() // unlock before checking the error
@@ -1634,9 +1635,25 @@ type SectionWithOpts struct {
// V1GetConfig will retrieve from CGRConfig a section
func (cfg *CGRConfig) V1GetConfig(args *SectionWithOpts, reply *map[string]interface{}) (err error) {
args.Section = utils.FirstNonEmpty(args.Section, utils.MetaAll)
cfg.cacheDPMux.RLock()
if mp, has := cfg.cacheDP[args.Section]; has && mp != nil {
*reply = mp
cfg.cacheDPMux.RUnlock()
return
}
cfg.cacheDPMux.RUnlock()
defer func() {
if err != nil {
return
}
cfg.cacheDPMux.Lock()
cfg.cacheDP[args.Section] = *reply
cfg.cacheDPMux.Unlock()
}()
var mp interface{}
switch args.Section {
case utils.EmptyString:
case utils.MetaAll:
*reply = cfg.AsMapInterface(cfg.GeneralCfg().RSRSep)
return
case GENERAL_JSN:
@@ -1762,13 +1779,15 @@ func (cfg *CGRConfig) V1SetConfig(args *SetConfigArgs, reply *string) (err error
if args.DryRun {
cfgV = cfg.Clone()
}
cfgV.reloadDPCache(sections...)
if err = cfgV.loadCfgFromJSONWithLocks(bytes.NewBuffer(b), sections); err != nil {
return
}
// lock all sections
cfgV.rLockSections()
cfgV.dp = utils.MapStorage(cfg.AsMapInterface(cfgV.generalCfg.RSRSep))
err = cfgV.checkConfigSanity()
cfgV.rUnlockSections() // unlock before checking the error
@@ -1784,11 +1803,28 @@ func (cfg *CGRConfig) V1SetConfig(args *SetConfigArgs, reply *string) (err error
//V1GetConfigAsJSON will retrieve from CGRConfig a section as a string
func (cfg *CGRConfig) V1GetConfigAsJSON(args *SectionWithOpts, reply *string) (err error) {
args.Section = utils.FirstNonEmpty(args.Section, utils.MetaAll)
cfg.cacheDPMux.RLock()
if mp, has := cfg.cacheDP[args.Section]; has && mp != nil {
*reply = utils.ToJSON(mp)
cfg.cacheDPMux.RUnlock()
return
}
cfg.cacheDPMux.RUnlock()
var rplyMap utils.MapStorage
defer func() {
if err != nil {
return
}
cfg.cacheDPMux.Lock()
cfg.cacheDP[args.Section] = rplyMap
cfg.cacheDPMux.Unlock()
}()
var mp interface{}
switch args.Section {
case utils.EmptyString:
mp = cfg.AsMapInterface(cfg.GeneralCfg().RSRSep)
*reply = utils.ToJSON(mp)
case utils.MetaAll:
rplyMap = cfg.AsMapInterface(cfg.GeneralCfg().RSRSep)
*reply = utils.ToJSON(rplyMap)
return
case GENERAL_JSN:
mp = cfg.GeneralCfg().AsMapInterface()
@@ -1881,7 +1917,8 @@ func (cfg *CGRConfig) V1GetConfigAsJSON(args *SectionWithOpts, reply *string) (e
default:
return errors.New("Invalid section")
}
*reply = utils.ToJSON(map[string]interface{}{args.Section: mp})
rplyMap = map[string]interface{}{args.Section: mp}
*reply = utils.ToJSON(rplyMap)
return
}
@@ -1903,13 +1940,14 @@ func (cfg *CGRConfig) V1SetConfigFromJSON(args *SetConfigFromJSONArgs, reply *st
if args.DryRun {
cfgV = cfg.Clone()
}
cfgV.reloadDPCache(sortedCfgSections...)
if err = cfgV.loadCfgFromJSONWithLocks(bytes.NewBufferString(args.Config), sortedCfgSections); err != nil {
return
}
// lock all sections
cfgV.rLockSections()
cfgV.dp = utils.MapStorage(cfg.AsMapInterface(cfgV.generalCfg.RSRSep))
err = cfgV.checkConfigSanity()
cfgV.rUnlockSections() // unlock before checking the error
if err != nil {
@@ -1923,7 +1961,7 @@ func (cfg *CGRConfig) V1SetConfigFromJSON(args *SetConfigFromJSONArgs, reply *st
}
// Clone returns a deep copy of CGRConfig
func (cfg CGRConfig) Clone() (cln *CGRConfig) {
func (cfg *CGRConfig) Clone() (cln *CGRConfig) {
cln = &CGRConfig{
DataFolderPath: cfg.DataFolderPath,
ConfigPath: cfg.ConfigPath,
@@ -1975,12 +2013,32 @@ func (cfg CGRConfig) Clone() (cln *CGRConfig) {
coreSCfg: cfg.coreSCfg.Clone(),
actionSCfg: cfg.actionSCfg.Clone(),
accountSCfg: cfg.accountSCfg.Clone(),
cacheDP: make(map[string]utils.MapStorage),
}
cln.initChanels()
return
}
// GetDataProvider returns the config as a data provider interface
func (cfg CGRConfig) GetDataProvider() utils.DataProvider {
return cfg.dp
func (cfg *CGRConfig) reloadDPCache(sections ...string) {
cfg.cacheDPMux.Lock()
delete(cfg.cacheDP, utils.MetaAll)
for _, sec := range sections {
delete(cfg.cacheDP, sec)
}
cfg.cacheDPMux.Unlock()
}
// GetDataProvider returns the config as a data provider interface
func (cfg *CGRConfig) GetDataProvider() utils.DataProvider {
cfg.cacheDPMux.RLock()
val, has := cfg.cacheDP[utils.MetaAll]
cfg.cacheDPMux.RUnlock()
if !has || val == nil {
cfg.cacheDPMux.Lock()
val = utils.MapStorage(cfg.AsMapInterface(cfg.GeneralCfg().RSRSep))
cfg.cacheDP[utils.MetaAll] = val
cfg.cacheDPMux.Unlock()
}
return val
}

25
config/config_test.go
View File

@@ -3749,14 +3749,18 @@ func TestCgrCfgV1GetConfigAllConfig(t *testing.T) {
if err != nil {
t.Error(err)
}
expected := map[string]interface{}{}
expected := cgrCfg.AsMapInterface(cgrCfg.GeneralCfg().RSRSep)
if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: utils.EmptyString}, &rcv); err != nil {
t.Error(err)
} else {
rcv = map[string]interface{}{}
if !reflect.DeepEqual(expected, rcv) {
t.Errorf("Expected: %+v, received: %+v", utils.ToJSON(expected), utils.ToJSON(rcv))
}
t.Fatal(err)
}
if !reflect.DeepEqual(expected, rcv) {
t.Errorf("Expected: %+v, received: %+v", utils.ToJSON(expected), utils.ToJSON(rcv))
}
if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: utils.EmptyString}, &rcv); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(expected, rcv) {
t.Errorf("Expected: %+v, received: %+v", utils.ToJSON(expected), utils.ToJSON(rcv))
}
}
@@ -5596,6 +5600,11 @@ func TestV1GetConfigAsJSONAllConfig(t *testing.T) {
} else if expected != reply {
t.Errorf("Expected %+v \n, received %+v", expected, reply)
}
if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: utils.EmptyString}, &reply); err != nil {
t.Error(err)
} else if expected != reply {
t.Errorf("Expected %+v \n, received %+v", expected, reply)
}
}
func TestV1ReloadConfigFromJSONEmptyConfig(t *testing.T) {
@@ -5946,8 +5955,6 @@ func TestCGRConfigClone(t *testing.T) {
rcv.rldChans = nil
cfg.lks = nil
rcv.lks = nil
cfg.dp = nil
rcv.dp = nil
if !reflect.DeepEqual(cfg, rcv) {
t.Errorf("Expected: %+v\nReceived: %+v", utils.ToJSON(cfg), utils.ToJSON(rcv))
}