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

Removed duplicate constant

Browse Source
This commit is contained in:
Trial97
2019-09-30 13:24:46 +03:00
committed by Dan Christian Bogos
parent c11e32a1eb
commit a199d5183e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config/config.go
View File

@@ -1210,6 +1210,8 @@ func (self *CGRConfig) HttpAgentCfg() []*HttpAgentCfg {
}
func (cfg *CGRConfig) FilterSCfg() *FilterSCfg {
cfg.lks[FilterSjsn].Lock()
defer cfg.lks[FilterSjsn].Unlock()
return cfg.filterSCfg
}
@@ -1335,7 +1337,7 @@ func (cfg *CGRConfig) V1GetConfigSection(args *StringWithArgDispatcher, reply *m
jsonString = utils.ToJSON(cfg.ListenCfg())
case HTTP_JSN:
jsonString = utils.ToJSON(cfg.HTTPCfg())
case FILTERS_JSON:
case FilterSjsn:
jsonString = utils.ToJSON(cfg.FilterSCfg())
case RALS_JSN:
jsonString = utils.ToJSON(cfg.RalsCfg())
@@ -1500,7 +1502,7 @@ func (cfg *CGRConfig) reloadSection(section string) (err error) {
break
}
fallthrough
case FILTERS_JSON: // no need to reload
case FilterSjsn: // no need to reload
if !fall {
break
}
@@ -1728,9 +1730,9 @@ func (cfg *CGRConfig) loadConfig(path, section string) (err error) {
break
}
fallthrough
case FILTERS_JSON:
cfg.lks[FILTERS_JSON].Lock()
defer cfg.lks[FILTERS_JSON].Unlock()
case FilterSjsn:
cfg.lks[FilterSjsn].Lock()
defer cfg.lks[FilterSjsn].Unlock()
loadFuncs = append(loadFuncs, cfg.loadFilterSCfg)
if !fall {
break
@@ -2055,7 +2057,7 @@ func (cfg *CGRConfig) loadConfigFromHttp(urlPaths string, loadFuncs []func(jsnCf
func (cfg *CGRConfig) initChanels() {
cfg.lks = make(map[string]*sync.RWMutex)
cfg.rldChans = make(map[string]chan struct{})
for _, section := range []string{GENERAL_JSN, DATADB_JSN, STORDB_JSN, LISTEN_JSN, TlsCfgJson, HTTP_JSN, SCHEDULER_JSN, CACHE_JSN, FILTERS_JSON, RALS_JSN,
for _, section := range []string{GENERAL_JSN, DATADB_JSN, STORDB_JSN, LISTEN_JSN, TlsCfgJson, HTTP_JSN, SCHEDULER_JSN, CACHE_JSN, FilterSjsn, RALS_JSN,
CDRS_JSN, CDRE_JSN, CDRC_JSN, ERsJson, SessionSJson, AsteriskAgentJSN, FreeSWITCHAgentJSN, KamailioAgentJSN,
DA_JSN, RA_JSN, HttpAgentJson, DNSAgentJson, ATTRIBUTE_JSN, ChargerSCfgJson, RESOURCES_JSON, STATS_JSON, THRESHOLDS_JSON,
SupplierSJson, LoaderJson, MAILER_JSN, SURETAX_JSON, CgrLoaderCfgJson, CgrMigratorCfgJson, DispatcherSJson, AnalyzerCfgJson, Apier} {

1
config/config_json.go
View File

@@ -48,7 +48,6 @@ const (
STATS_JSON = "stats"
THRESHOLDS_JSON = "thresholds"
SupplierSJson = "suppliers"
FILTERS_JSON = "filters"
LoaderJson = "loaders"
MAILER_JSN = "mailer"
SURETAX_JSON = "suretax"