diff --git a/apier/v1/apier.go b/apier/v1/apier.go index 991408fa8..1c0589fd1 100644 --- a/apier/v1/apier.go +++ b/apier/v1/apier.go @@ -1338,6 +1338,7 @@ func (apiv1 *ApierV1) GetRatingPlanIDs(args utils.TenantArgWithPaginator, attrPr // ListenAndServe listen for storbd reload func (apiv1 *ApierV1) ListenAndServe(stopChan chan struct{}) (err error) { + utils.Logger.Info(fmt.Sprintf("<%s> starting <%s> subsystem", utils.CoreS, utils.ApierS)) for { select { case <-stopChan: @@ -1351,3 +1352,9 @@ func (apiv1 *ApierV1) ListenAndServe(stopChan chan struct{}) (err error) { } } } + +// Ping return pong if the service is active +func (apiv1 *ApierV1) Ping(ign *utils.CGREvent, reply *string) error { + *reply = utils.Pong + return nil +} diff --git a/cmd/cgr-engine/cgr-engine.go b/cmd/cgr-engine/cgr-engine.go index 3691e9d19..abbee5cde 100644 --- a/cmd/cgr-engine/cgr-engine.go +++ b/cmd/cgr-engine/cgr-engine.go @@ -486,9 +486,14 @@ func main() { schS := services.NewSchedulerService(cfg, dmService, cacheS, filterSChan, server, internalSchedulerSChan, connManager) - rals := services.NewRalService(cfg, dmService, storDBService, cacheS, filterSChan, server, - internalRALsChan, internalResponderChan, internalAPIerV1Chan, internalAPIerV2Chan, - schS, exitChan, connManager) + rals := services.NewRalService(cfg, cacheS, server, + internalRALsChan, internalResponderChan, + exitChan, connManager) + + apierV1 := services.NewApierV1Service(cfg, dmService, storDBService, filterSChan, server, schS, rals.GetResponderService(), + internalAPIerV1Chan, connManager) + + apierV2 := services.NewApierV2Service(apierV1, cfg, server, internalAPIerV2Chan) cdrS := services.NewCDRServer(cfg, dmService, storDBService, filterSChan, server, internalCDRServerChan, connManager) @@ -500,7 +505,7 @@ func main() { anz := services.NewAnalyzerService(cfg, server, exitChan, internalAnalyzerSChan) srvManager.AddServices(attrS, chrS, tS, stS, reS, supS, schS, rals, - rals.GetResponder(), rals.GetAPIv1(), rals.GetAPIv2(), cdrS, smg, + rals.GetResponder(), apierV1, apierV2, cdrS, smg, services.NewEventReaderService(cfg, filterSChan, exitChan, connManager), services.NewDNSAgent(cfg, filterSChan, exitChan, connManager), services.NewFreeswitchAgent(cfg, exitChan, connManager), @@ -522,8 +527,8 @@ func main() { engine.IntRPC = engine.NewRPCClientSet() if cfg.DispatcherSCfg().Enabled { engine.IntRPC.AddInternalRPCClient(utils.AnalyzerSv1, anz.GetIntenternalChan()) - engine.IntRPC.AddInternalRPCClient(utils.ApierV1, rals.GetAPIv1().GetIntenternalChan()) - engine.IntRPC.AddInternalRPCClient(utils.ApierV2, rals.GetAPIv2().GetIntenternalChan()) + engine.IntRPC.AddInternalRPCClient(utils.ApierV1, apierV1.GetIntenternalChan()) + engine.IntRPC.AddInternalRPCClient(utils.ApierV2, apierV2.GetIntenternalChan()) engine.IntRPC.AddInternalRPCClient(utils.AttributeSv1, attrS.GetIntenternalChan()) engine.IntRPC.AddInternalRPCClient(utils.CacheSv1, internalCacheSChan) engine.IntRPC.AddInternalRPCClient(utils.CDRsV1, cdrS.GetIntenternalChan()) diff --git a/config/apiercfg.go b/config/apiercfg.go index 4b1375e21..1c958d7ae 100644 --- a/config/apiercfg.go +++ b/config/apiercfg.go @@ -22,6 +22,7 @@ import "github.com/cgrates/cgrates/utils" // ApierCfg is the configuration of Apier service type ApierCfg struct { + Enabled bool CachesConns []string // connections towards Cache SchedulerConns []string // connections towards Scheduler AttributeSConns []string // connections towards AttributeS @@ -31,6 +32,9 @@ func (aCfg *ApierCfg) loadFromJsonCfg(jsnCfg *ApierJsonCfg) (err error) { if jsnCfg == nil { return } + if jsnCfg.Enabled != nil { + aCfg.Enabled = *jsnCfg.Enabled + } if jsnCfg.Caches_conns != nil { aCfg.CachesConns = make([]string, len(*jsnCfg.Caches_conns)) for idx, conn := range *jsnCfg.Caches_conns { diff --git a/config/config.go b/config/config.go index 2bb9ee319..002f74eb3 100755 --- a/config/config.go +++ b/config/config.go @@ -981,8 +981,8 @@ func (cfg *CGRConfig) AnalyzerSCfg() *AnalyzerSCfg { // ApierCfg reads the Apier configuration func (cfg *CGRConfig) ApierCfg() *ApierCfg { - cfg.lks[Apier].Lock() - defer cfg.lks[Apier].Unlock() + cfg.lks[ApierS].Lock() + defer cfg.lks[ApierS].Unlock() return cfg.apier } @@ -1080,7 +1080,7 @@ func (cfg *CGRConfig) V1GetConfigSection(args *StringWithArgDispatcher, reply *m jsonString = utils.ToJSON(cfg.LoaderCgrCfg()) case CgrMigratorCfgJson: jsonString = utils.ToJSON(cfg.MigratorCgrCfg()) - case Apier: + case ApierS: jsonString = utils.ToJSON(cfg.ApierCfg()) case CDRE_JSN: jsonString = utils.ToJSON(cfg.CdreProfiles) @@ -1193,7 +1193,7 @@ func (cfg *CGRConfig) getLoadFunctions() map[string]func(*CgrJsonCfg) error { CgrMigratorCfgJson: cfg.loadMigratorCgrCfg, DispatcherSJson: cfg.loadDispatcherSCfg, AnalyzerCfgJson: cfg.loadAnalyzerCgrCfg, - Apier: cfg.loadApierCfg, + ApierS: cfg.loadApierCfg, RPCConnsJsonName: cfg.loadRPCConns, } } @@ -1388,7 +1388,7 @@ func (cfg *CGRConfig) reloadSections(sections ...string) (err error) { RALS_JSN, CDRS_JSN, SessionSJson, ATTRIBUTE_JSN, ChargerSCfgJson, RESOURCES_JSON, STATS_JSON, THRESHOLDS_JSON, SupplierSJson, LoaderJson, DispatcherSJson}) - subsystemsThatNeedStorDB := utils.NewStringSet([]string{STORDB_JSN, RALS_JSN, CDRS_JSN, Apier}) + subsystemsThatNeedStorDB := utils.NewStringSet([]string{STORDB_JSN, RALS_JSN, CDRS_JSN, ApierS}) needsDataDB := false needsStorDB := false for _, section := range sections { @@ -1457,8 +1457,8 @@ func (cfg *CGRConfig) reloadSections(sections ...string) (err error) { case DispatcherSJson: cfg.rldChans[DispatcherSJson] <- struct{}{} case AnalyzerCfgJson: - case Apier: - cfg.rldChans[Apier] <- struct{}{} + case ApierS: + cfg.rldChans[ApierS] <- struct{}{} } return } diff --git a/config/config_defaults.go b/config/config_defaults.go index 42c368cbb..45859fda4 100755 --- a/config/config_defaults.go +++ b/config/config_defaults.go @@ -810,7 +810,8 @@ const CGRATES_CFG_JSON = ` }, -"apier": { +"apiers": { + "enabled": false, "caches_conns":["*internal"], "scheduler_conns": [], // connections to SchedulerS for reloads "attributes_conns": [], // connections to AttributeS for CDRExporter diff --git a/config/config_json.go b/config/config_json.go index 5bee771b4..1116b1583 100644 --- a/config/config_json.go +++ b/config/config_json.go @@ -55,7 +55,7 @@ const ( ChargerSCfgJson = "chargers" TlsCfgJson = "tls" AnalyzerCfgJson = "analyzers" - Apier = "apier" + ApierS = "apiers" DNSAgentJson = "dns_agent" ERsJson = "ers" RPCConnsJsonName = "rpc_conns" @@ -65,7 +65,7 @@ var ( sortedCfgSections = []string{GENERAL_JSN, RPCConnsJsonName, DATADB_JSN, STORDB_JSN, LISTEN_JSN, TlsCfgJson, HTTP_JSN, SCHEDULER_JSN, CACHE_JSN, FilterSjsn, RALS_JSN, CDRS_JSN, CDRE_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} + SupplierSJson, LoaderJson, MAILER_JSN, SURETAX_JSON, CgrLoaderCfgJson, CgrMigratorCfgJson, DispatcherSJson, AnalyzerCfgJson, ApierS} ) // Loads the json config out of io.Reader, eg other sources than file, maybe over http @@ -483,7 +483,7 @@ func (self CgrJsonCfg) AnalyzerCfgJson() (*AnalyzerSJsonCfg, error) { } func (self CgrJsonCfg) ApierCfgJson() (*ApierJsonCfg, error) { - rawCfg, hasKey := self[Apier] + rawCfg, hasKey := self[ApierS] if !hasKey { return nil, nil } diff --git a/config/config_json_test.go b/config/config_json_test.go index 1d8b385c4..65799f7f4 100755 --- a/config/config_json_test.go +++ b/config/config_json_test.go @@ -1585,6 +1585,7 @@ func TestDfAnalyzerCfg(t *testing.T) { func TestDfApierCfg(t *testing.T) { eCfg := &ApierJsonCfg{ + Enabled: utils.BoolPointer(false), Caches_conns: &[]string{utils.MetaInternal}, Scheduler_conns: &[]string{}, Attributes_conns: &[]string{}, diff --git a/config/config_test.go b/config/config_test.go index c89d4c254..f6f85a6f2 100755 --- a/config/config_test.go +++ b/config/config_test.go @@ -1573,6 +1573,7 @@ func TestNewCGRConfigFromPathNotFound(t *testing.T) { func TestCgrCfgJSONDefaultApierCfg(t *testing.T) { aCfg := &ApierCfg{ + Enabled: false, CachesConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}, SchedulerConns: []string{}, AttributeSConns: []string{}, diff --git a/config/libconfig_json.go b/config/libconfig_json.go index 20a0a73e8..005b69c68 100755 --- a/config/libconfig_json.go +++ b/config/libconfig_json.go @@ -548,6 +548,7 @@ type AnalyzerSJsonCfg struct { } type ApierJsonCfg struct { + Enabled *bool Caches_conns *[]string Scheduler_conns *[]string Attributes_conns *[]string diff --git a/console/ping.go b/console/ping.go index c643e1aa5..36eaffd1b 100644 --- a/console/ping.go +++ b/console/ping.go @@ -77,6 +77,8 @@ func (self *CmdApierPing) RpcMethod() string { return utils.RALsV1Ping case utils.ReplicatorLow: return utils.ReplicatorSv1Ping + case utils.ApierSLow: + return utils.ApierV1Ping default: } return self.rpcMethod diff --git a/data/conf/samples/acc_balance_keep_internal/cgrates.json b/data/conf/samples/acc_balance_keep_internal/cgrates.json index ce4b29385..7a02a433a 100644 --- a/data/conf/samples/acc_balance_keep_internal/cgrates.json +++ b/data/conf/samples/acc_balance_keep_internal/cgrates.json @@ -117,7 +117,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json b/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json index 2acbb9cc4..10aafff31 100644 --- a/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json +++ b/data/conf/samples/acc_balance_keep_internal_gob/cgrates.json @@ -123,7 +123,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/acc_balance_keep_mongo/cgrates.json b/data/conf/samples/acc_balance_keep_mongo/cgrates.json index dc1fdc297..c61248a1b 100644 --- a/data/conf/samples/acc_balance_keep_mongo/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mongo/cgrates.json @@ -118,7 +118,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json b/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json index 314de0549..08dd0c604 100644 --- a/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mongo_gob/cgrates.json @@ -127,7 +127,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/acc_balance_keep_mysql/cgrates.json b/data/conf/samples/acc_balance_keep_mysql/cgrates.json index c9349010a..5c93526bc 100644 --- a/data/conf/samples/acc_balance_keep_mysql/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mysql/cgrates.json @@ -117,7 +117,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json b/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json index 9623b3545..6d815d1d0 100644 --- a/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json +++ b/data/conf/samples/acc_balance_keep_mysql_gob/cgrates.json @@ -124,7 +124,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions/cgradmin.json b/data/conf/samples/actions/cgradmin.json index d82dea79c..4149cca5b 100644 --- a/data/conf/samples/actions/cgradmin.json +++ b/data/conf/samples/actions/cgradmin.json @@ -44,7 +44,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions_gob/cgradmin.json b/data/conf/samples/actions_gob/cgradmin.json index 9cb50302a..58247abe9 100644 --- a/data/conf/samples/actions_gob/cgradmin.json +++ b/data/conf/samples/actions_gob/cgradmin.json @@ -51,7 +51,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions_internal/cgradmin.json b/data/conf/samples/actions_internal/cgradmin.json index 068f8368b..09d950cd6 100644 --- a/data/conf/samples/actions_internal/cgradmin.json +++ b/data/conf/samples/actions_internal/cgradmin.json @@ -50,7 +50,8 @@ "store_interval": "-1", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions_internal_gob/cgradmin.json b/data/conf/samples/actions_internal_gob/cgradmin.json index fcb24e166..565293191 100644 --- a/data/conf/samples/actions_internal_gob/cgradmin.json +++ b/data/conf/samples/actions_internal_gob/cgradmin.json @@ -58,7 +58,8 @@ "store_interval": "-1", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions_mongo/cgradmin.json b/data/conf/samples/actions_mongo/cgradmin.json index 3dc674ccd..5f77eb2c1 100644 --- a/data/conf/samples/actions_mongo/cgradmin.json +++ b/data/conf/samples/actions_mongo/cgradmin.json @@ -55,7 +55,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions_mongo_gob/cgradmin.json b/data/conf/samples/actions_mongo_gob/cgradmin.json index 2ed111e9a..6addcb5d4 100644 --- a/data/conf/samples/actions_mongo_gob/cgradmin.json +++ b/data/conf/samples/actions_mongo_gob/cgradmin.json @@ -59,7 +59,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions_mysql/cgradmin.json b/data/conf/samples/actions_mysql/cgradmin.json index 7bec4499d..48bba4b17 100644 --- a/data/conf/samples/actions_mysql/cgradmin.json +++ b/data/conf/samples/actions_mysql/cgradmin.json @@ -52,7 +52,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/actions_mysql_gob/cgradmin.json b/data/conf/samples/actions_mysql_gob/cgradmin.json index 5c700341b..521a90b56 100644 --- a/data/conf/samples/actions_mysql_gob/cgradmin.json +++ b/data/conf/samples/actions_mysql_gob/cgradmin.json @@ -59,7 +59,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/apier_internal/apier.json b/data/conf/samples/apier_internal/apier.json index 0b8ad448c..e3135f36d 100644 --- a/data/conf/samples/apier_internal/apier.json +++ b/data/conf/samples/apier_internal/apier.json @@ -85,7 +85,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/apier_mongo/apier.json b/data/conf/samples/apier_mongo/apier.json index 8ee3da322..10bdbc225 100644 --- a/data/conf/samples/apier_mongo/apier.json +++ b/data/conf/samples/apier_mongo/apier.json @@ -86,7 +86,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/apier_mysql/apier.json b/data/conf/samples/apier_mysql/apier.json index 794ee81f6..da8307ebb 100644 --- a/data/conf/samples/apier_mysql/apier.json +++ b/data/conf/samples/apier_mysql/apier.json @@ -83,7 +83,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrewithattributes/cgrates.json b/data/conf/samples/cdrewithattributes/cgrates.json index 0a804b440..a4ede7d44 100755 --- a/data/conf/samples/cdrewithattributes/cgrates.json +++ b/data/conf/samples/cdrewithattributes/cgrates.json @@ -69,7 +69,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["*internal"], "scheduler_conns": ["*internal"], "attributes_conns": ["*internal"], // connections to AttributeS for CDRExporter diff --git a/data/conf/samples/cdrewithfilter_internal/cgrates.json b/data/conf/samples/cdrewithfilter_internal/cgrates.json index e287b81e3..c9ad22d2d 100755 --- a/data/conf/samples/cdrewithfilter_internal/cgrates.json +++ b/data/conf/samples/cdrewithfilter_internal/cgrates.json @@ -114,7 +114,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrewithfilter_mongo/cgrates.json b/data/conf/samples/cdrewithfilter_mongo/cgrates.json index cf33861cb..9024383e3 100755 --- a/data/conf/samples/cdrewithfilter_mongo/cgrates.json +++ b/data/conf/samples/cdrewithfilter_mongo/cgrates.json @@ -118,7 +118,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrewithfilter_mysql/cgrates.json b/data/conf/samples/cdrewithfilter_mysql/cgrates.json index ab1e01d78..238b11e12 100755 --- a/data/conf/samples/cdrewithfilter_mysql/cgrates.json +++ b/data/conf/samples/cdrewithfilter_mysql/cgrates.json @@ -116,7 +116,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json index a8048f417..61b446b43 100644 --- a/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mongo/cdrsreplicationmaster.json @@ -130,4 +130,10 @@ }, }, + +"apiers": { + "enabled": true, +}, + + } \ No newline at end of file diff --git a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json index be8b85513..36c3457a0 100644 --- a/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json +++ b/data/conf/samples/cdrsonexpmaster_mysql/cdrsreplicationmaster.json @@ -128,4 +128,10 @@ }, }, + +"apiers": { + "enabled": true, +}, + + } \ No newline at end of file diff --git a/data/conf/samples/cdrsonexpslave_mongo/cdrsreplicationslave.json b/data/conf/samples/cdrsonexpslave_mongo/cdrsreplicationslave.json index e6f68cdd2..65165bd29 100644 --- a/data/conf/samples/cdrsonexpslave_mongo/cdrsreplicationslave.json +++ b/data/conf/samples/cdrsonexpslave_mongo/cdrsreplicationslave.json @@ -37,4 +37,9 @@ }, +"apiers": { + "enabled": true, +}, + + } \ No newline at end of file diff --git a/data/conf/samples/cdrsonexpslave_mysql/cdrsreplicationslave.json b/data/conf/samples/cdrsonexpslave_mysql/cdrsreplicationslave.json index ba290ddf1..1b1c1e9c9 100644 --- a/data/conf/samples/cdrsonexpslave_mysql/cdrsreplicationslave.json +++ b/data/conf/samples/cdrsonexpslave_mysql/cdrsreplicationslave.json @@ -35,4 +35,9 @@ }, +"apiers": { + "enabled": true, +}, + + } \ No newline at end of file diff --git a/data/conf/samples/cdrsv1internal/cgrates.json b/data/conf/samples/cdrsv1internal/cgrates.json index 3ee7c29fb..f6d2e9ae8 100644 --- a/data/conf/samples/cdrsv1internal/cgrates.json +++ b/data/conf/samples/cdrsv1internal/cgrates.json @@ -30,7 +30,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv1mongo/cgrates.json b/data/conf/samples/cdrsv1mongo/cgrates.json index 01f2da50d..00c90859d 100644 --- a/data/conf/samples/cdrsv1mongo/cgrates.json +++ b/data/conf/samples/cdrsv1mongo/cgrates.json @@ -33,7 +33,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv1mysql/cgrates.json b/data/conf/samples/cdrsv1mysql/cgrates.json index df0cfbe39..f3f8a2db4 100644 --- a/data/conf/samples/cdrsv1mysql/cgrates.json +++ b/data/conf/samples/cdrsv1mysql/cgrates.json @@ -30,7 +30,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv1postgres/cgrates.json b/data/conf/samples/cdrsv1postgres/cgrates.json index 0fb2fbb62..c105245c0 100644 --- a/data/conf/samples/cdrsv1postgres/cgrates.json +++ b/data/conf/samples/cdrsv1postgres/cgrates.json @@ -32,7 +32,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv1processevent/cgrates.json b/data/conf/samples/cdrsv1processevent/cgrates.json index 3c8df7f9c..75bb4190f 100644 --- a/data/conf/samples/cdrsv1processevent/cgrates.json +++ b/data/conf/samples/cdrsv1processevent/cgrates.json @@ -70,7 +70,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv1processeventmongo/cgrates.json b/data/conf/samples/cdrsv1processeventmongo/cgrates.json index 85042867a..a89edad92 100644 --- a/data/conf/samples/cdrsv1processeventmongo/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmongo/cgrates.json @@ -74,7 +74,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv1processeventmysql/cgrates.json b/data/conf/samples/cdrsv1processeventmysql/cgrates.json index 0cd5f835b..237e946f9 100644 --- a/data/conf/samples/cdrsv1processeventmysql/cgrates.json +++ b/data/conf/samples/cdrsv1processeventmysql/cgrates.json @@ -71,7 +71,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv2internal/cgrates.json b/data/conf/samples/cdrsv2internal/cgrates.json index 1905c99b9..9d4a25f1e 100644 --- a/data/conf/samples/cdrsv2internal/cgrates.json +++ b/data/conf/samples/cdrsv2internal/cgrates.json @@ -51,7 +51,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv2mongo/cgrates.json b/data/conf/samples/cdrsv2mongo/cgrates.json index c4cc4c5cb..cedef56bc 100644 --- a/data/conf/samples/cdrsv2mongo/cgrates.json +++ b/data/conf/samples/cdrsv2mongo/cgrates.json @@ -52,7 +52,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv2mongo_gob/cgrates.json b/data/conf/samples/cdrsv2mongo_gob/cgrates.json index 3d440a4ae..7978f8f26 100644 --- a/data/conf/samples/cdrsv2mongo_gob/cgrates.json +++ b/data/conf/samples/cdrsv2mongo_gob/cgrates.json @@ -61,7 +61,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json b/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json index 83b43fbc7..c973e41fe 100644 --- a/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json +++ b/data/conf/samples/cdrsv2mysql/cdrsv2mysql.json @@ -52,7 +52,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv2mysql_gob/cdrsv2mysql.json b/data/conf/samples/cdrsv2mysql_gob/cdrsv2mysql.json index 9253a8070..a07bceeee 100644 --- a/data/conf/samples/cdrsv2mysql_gob/cdrsv2mysql.json +++ b/data/conf/samples/cdrsv2mysql_gob/cdrsv2mysql.json @@ -60,7 +60,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv2psql/cdrsv2psql.json b/data/conf/samples/cdrsv2psql/cdrsv2psql.json index 84202251b..3a6a7bec6 100644 --- a/data/conf/samples/cdrsv2psql/cdrsv2psql.json +++ b/data/conf/samples/cdrsv2psql/cdrsv2psql.json @@ -52,7 +52,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/cdrsv_failover_internal/cgrates.json b/data/conf/samples/cdrsv_failover_internal/cgrates.json index cfe8d9e30..ce03044c4 100644 --- a/data/conf/samples/cdrsv_failover_internal/cgrates.json +++ b/data/conf/samples/cdrsv_failover_internal/cgrates.json @@ -54,7 +54,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, @@ -69,4 +70,5 @@ }, }, + } diff --git a/data/conf/samples/cdrsv_failover_mongo/cgrates.json b/data/conf/samples/cdrsv_failover_mongo/cgrates.json index 2dd9551b0..f55925986 100644 --- a/data/conf/samples/cdrsv_failover_mongo/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mongo/cgrates.json @@ -63,7 +63,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, @@ -78,4 +79,5 @@ }, }, + } diff --git a/data/conf/samples/cdrsv_failover_mysql/cgrates.json b/data/conf/samples/cdrsv_failover_mysql/cgrates.json index 1a7b6576f..232eb1e76 100644 --- a/data/conf/samples/cdrsv_failover_mysql/cgrates.json +++ b/data/conf/samples/cdrsv_failover_mysql/cgrates.json @@ -61,7 +61,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, @@ -76,4 +77,5 @@ }, }, + } diff --git a/data/conf/samples/cluelrn/cgrates.json b/data/conf/samples/cluelrn/cgrates.json index c13c9c294..56baad356 100644 --- a/data/conf/samples/cluelrn/cgrates.json +++ b/data/conf/samples/cluelrn/cgrates.json @@ -55,7 +55,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dbinternal/cgrates.json b/data/conf/samples/dbinternal/cgrates.json index 62bdddcb8..b943304b6 100755 --- a/data/conf/samples/dbinternal/cgrates.json +++ b/data/conf/samples/dbinternal/cgrates.json @@ -80,7 +80,8 @@ "out_stordb_type": "internal", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diam_tutmysql/cgrates.json b/data/conf/samples/diam_tutmysql/cgrates.json index bdfbf6cdb..42c982929 100644 --- a/data/conf/samples/diam_tutmysql/cgrates.json +++ b/data/conf/samples/diam_tutmysql/cgrates.json @@ -70,7 +70,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamagent_internal/cgrates.json b/data/conf/samples/diamagent_internal/cgrates.json index 006ef8e89..1dda0388f 100644 --- a/data/conf/samples/diamagent_internal/cgrates.json +++ b/data/conf/samples/diamagent_internal/cgrates.json @@ -59,7 +59,8 @@ "asr_template": "*asr", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamagent_mongo/cgrates.json b/data/conf/samples/diamagent_mongo/cgrates.json index dabe6b0a5..cdd8c017e 100644 --- a/data/conf/samples/diamagent_mongo/cgrates.json +++ b/data/conf/samples/diamagent_mongo/cgrates.json @@ -64,7 +64,8 @@ "asr_template": "*asr", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamagent_mysql/cgrates.json b/data/conf/samples/diamagent_mysql/cgrates.json index dc4911a8d..1fb47b46b 100644 --- a/data/conf/samples/diamagent_mysql/cgrates.json +++ b/data/conf/samples/diamagent_mysql/cgrates.json @@ -60,7 +60,8 @@ "asr_template": "*asr", }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamagentmaxconn_internal/cgrates.json b/data/conf/samples/diamagentmaxconn_internal/cgrates.json index 1c10b412c..b04158aea 100755 --- a/data/conf/samples/diamagentmaxconn_internal/cgrates.json +++ b/data/conf/samples/diamagentmaxconn_internal/cgrates.json @@ -70,7 +70,8 @@ ], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamagentmaxconn_mongo/cgrates.json b/data/conf/samples/diamagentmaxconn_mongo/cgrates.json index 1d14010de..3a842d465 100755 --- a/data/conf/samples/diamagentmaxconn_mongo/cgrates.json +++ b/data/conf/samples/diamagentmaxconn_mongo/cgrates.json @@ -74,7 +74,8 @@ ], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamagentmaxconn_mysql/cgrates.json b/data/conf/samples/diamagentmaxconn_mysql/cgrates.json index fbda6c826..9ca637ee3 100755 --- a/data/conf/samples/diamagentmaxconn_mysql/cgrates.json +++ b/data/conf/samples/diamagentmaxconn_mysql/cgrates.json @@ -70,7 +70,8 @@ ], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamsctpagent_internal/cgrates.json b/data/conf/samples/diamsctpagent_internal/cgrates.json index d90cf3204..faa3e0195 100755 --- a/data/conf/samples/diamsctpagent_internal/cgrates.json +++ b/data/conf/samples/diamsctpagent_internal/cgrates.json @@ -62,7 +62,8 @@ "sessions_conns": ["*localhost"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamsctpagent_mongo/cgrates.json b/data/conf/samples/diamsctpagent_mongo/cgrates.json index 32e26b650..6b70040b7 100755 --- a/data/conf/samples/diamsctpagent_mongo/cgrates.json +++ b/data/conf/samples/diamsctpagent_mongo/cgrates.json @@ -66,7 +66,8 @@ "sessions_conns": ["*localhost"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/diamsctpagent_mysql/cgrates.json b/data/conf/samples/diamsctpagent_mysql/cgrates.json index 0d708fe86..6c91de1a3 100755 --- a/data/conf/samples/diamsctpagent_mysql/cgrates.json +++ b/data/conf/samples/diamsctpagent_mysql/cgrates.json @@ -62,7 +62,8 @@ "sessions_conns": ["*localhost"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/all/cgrates.json b/data/conf/samples/dispatchers/all/cgrates.json index ec3d09ad6..6abee8058 100644 --- a/data/conf/samples/dispatchers/all/cgrates.json +++ b/data/conf/samples/dispatchers/all/cgrates.json @@ -87,7 +87,8 @@ "cdrs_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/all2/cgrates.json b/data/conf/samples/dispatchers/all2/cgrates.json index 5e25686f2..7e8f4c3da 100644 --- a/data/conf/samples/dispatchers/all2/cgrates.json +++ b/data/conf/samples/dispatchers/all2/cgrates.json @@ -82,7 +82,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/all2_mongo/cgrates.json b/data/conf/samples/dispatchers/all2_mongo/cgrates.json index 878083285..77f0cbf23 100644 --- a/data/conf/samples/dispatchers/all2_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/all2_mongo/cgrates.json @@ -86,7 +86,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/all2_mysql/cgrates.json b/data/conf/samples/dispatchers/all2_mysql/cgrates.json index 2c1b2905b..3a109dedd 100644 --- a/data/conf/samples/dispatchers/all2_mysql/cgrates.json +++ b/data/conf/samples/dispatchers/all2_mysql/cgrates.json @@ -83,7 +83,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/all_mongo/cgrates.json b/data/conf/samples/dispatchers/all_mongo/cgrates.json index b65afbf83..d5a80a8cc 100644 --- a/data/conf/samples/dispatchers/all_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/all_mongo/cgrates.json @@ -90,7 +90,8 @@ "cdrs_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/all_mysql/cgrates.json b/data/conf/samples/dispatchers/all_mysql/cgrates.json index f97063220..1ad0c5c7b 100644 --- a/data/conf/samples/dispatchers/all_mysql/cgrates.json +++ b/data/conf/samples/dispatchers/all_mysql/cgrates.json @@ -90,7 +90,8 @@ "cdrs_conns": ["*internal"], }, - "apier": { + "apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/dispatchers/diamagent/cgrates.json b/data/conf/samples/dispatchers/diamagent/cgrates.json index f98c70bcf..da920333f 100644 --- a/data/conf/samples/dispatchers/diamagent/cgrates.json +++ b/data/conf/samples/dispatchers/diamagent/cgrates.json @@ -55,7 +55,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"] } } diff --git a/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json b/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json index 7c4efb2f7..ed0603355 100644 --- a/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_internal/cgrates.json @@ -67,7 +67,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json index bb2005754..dd1d060f1 100644 --- a/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_internal_gob/cgrates.json @@ -73,7 +73,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json index a61e81682..4620d8619 100644 --- a/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mongo/cgrates.json @@ -69,7 +69,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json index 5329612e4..2be4c5c98 100644 --- a/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mongo_gob/cgrates.json @@ -76,7 +76,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json index 1fd1c9de9..9357d728a 100755 --- a/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mysql/cgrates.json @@ -58,7 +58,8 @@ "attributes_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json b/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json index 899ae45fd..cf42f8476 100755 --- a/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_mysql_gob/cgrates.json @@ -75,7 +75,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json index f045eb330..ad98db4c6 100755 --- a/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json +++ b/data/conf/samples/dispatchers/dispatchers_no_attributes/cgrates.json @@ -44,7 +44,8 @@ "enabled": true, }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dispatchers/radagent/cgrates.json b/data/conf/samples/dispatchers/radagent/cgrates.json index 460de25ee..9f3bb91ae 100644 --- a/data/conf/samples/dispatchers/radagent/cgrates.json +++ b/data/conf/samples/dispatchers/radagent/cgrates.json @@ -143,7 +143,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/dnsagent_internal/cgrates.json b/data/conf/samples/dnsagent_internal/cgrates.json index 51fe78347..4857efd1a 100644 --- a/data/conf/samples/dnsagent_internal/cgrates.json +++ b/data/conf/samples/dnsagent_internal/cgrates.json @@ -70,7 +70,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dnsagent_mongo/cgrates.json b/data/conf/samples/dnsagent_mongo/cgrates.json index b531ed6c7..bfee9d2f1 100644 --- a/data/conf/samples/dnsagent_mongo/cgrates.json +++ b/data/conf/samples/dnsagent_mongo/cgrates.json @@ -75,7 +75,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dnsagent_mysql/cgrates.json b/data/conf/samples/dnsagent_mysql/cgrates.json index 66d1ff2e1..2dd1ad64d 100644 --- a/data/conf/samples/dnsagent_mysql/cgrates.json +++ b/data/conf/samples/dnsagent_mysql/cgrates.json @@ -66,7 +66,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/dnsagent_reload/cgrates.json b/data/conf/samples/dnsagent_reload/cgrates.json index d546581f7..8ec0e714d 100644 --- a/data/conf/samples/dnsagent_reload/cgrates.json +++ b/data/conf/samples/dnsagent_reload/cgrates.json @@ -66,7 +66,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } \ No newline at end of file diff --git a/data/conf/samples/ers_example/cgrates.json b/data/conf/samples/ers_example/cgrates.json index d5ec60610..b13580bc1 100644 --- a/data/conf/samples/ers_example/cgrates.json +++ b/data/conf/samples/ers_example/cgrates.json @@ -93,7 +93,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/ers_internal/cgrates.json b/data/conf/samples/ers_internal/cgrates.json index d1bf29499..10bc0dff3 100644 --- a/data/conf/samples/ers_internal/cgrates.json +++ b/data/conf/samples/ers_internal/cgrates.json @@ -352,7 +352,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_mongo/cgrates.json b/data/conf/samples/ers_mongo/cgrates.json index d7cf6b793..123aa7951 100644 --- a/data/conf/samples/ers_mongo/cgrates.json +++ b/data/conf/samples/ers_mongo/cgrates.json @@ -355,7 +355,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_mysql/cgrates.json b/data/conf/samples/ers_mysql/cgrates.json index c232bdadd..24723f226 100644 --- a/data/conf/samples/ers_mysql/cgrates.json +++ b/data/conf/samples/ers_mysql/cgrates.json @@ -353,7 +353,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_postgres/cgrates.json b/data/conf/samples/ers_postgres/cgrates.json index f639221b2..211a25ed8 100644 --- a/data/conf/samples/ers_postgres/cgrates.json +++ b/data/conf/samples/ers_postgres/cgrates.json @@ -349,7 +349,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_reload/disabled/cgrates.json b/data/conf/samples/ers_reload/disabled/cgrates.json index 179c571b0..68b215b7f 100644 --- a/data/conf/samples/ers_reload/disabled/cgrates.json +++ b/data/conf/samples/ers_reload/disabled/cgrates.json @@ -64,7 +64,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_reload/disabled_internal/cgrates.json b/data/conf/samples/ers_reload/disabled_internal/cgrates.json index f74d2c52a..1986655d9 100644 --- a/data/conf/samples/ers_reload/disabled_internal/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_internal/cgrates.json @@ -71,7 +71,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_reload/disabled_mongo/cgrates.json b/data/conf/samples/ers_reload/disabled_mongo/cgrates.json index cabc2dbf2..9b397f8a1 100644 --- a/data/conf/samples/ers_reload/disabled_mongo/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_mongo/cgrates.json @@ -72,7 +72,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_reload/disabled_mysql/cgrates.json b/data/conf/samples/ers_reload/disabled_mysql/cgrates.json index 1b7d6ca16..8b2933d2d 100644 --- a/data/conf/samples/ers_reload/disabled_mysql/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_mysql/cgrates.json @@ -71,7 +71,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_reload/disabled_postgres/cgrates.json b/data/conf/samples/ers_reload/disabled_postgres/cgrates.json index a61f0fed6..5407e70fa 100644 --- a/data/conf/samples/ers_reload/disabled_postgres/cgrates.json +++ b/data/conf/samples/ers_reload/disabled_postgres/cgrates.json @@ -72,7 +72,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_reload/first_reload/cgrates.json b/data/conf/samples/ers_reload/first_reload/cgrates.json index 1c530752c..15346b2ed 100644 --- a/data/conf/samples/ers_reload/first_reload/cgrates.json +++ b/data/conf/samples/ers_reload/first_reload/cgrates.json @@ -105,7 +105,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/ers_reload/internal/cgrates.json b/data/conf/samples/ers_reload/internal/cgrates.json index 96b0160d1..f178b5ce0 100644 --- a/data/conf/samples/ers_reload/internal/cgrates.json +++ b/data/conf/samples/ers_reload/internal/cgrates.json @@ -93,7 +93,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/ers_reload/second_reload/cgrates.json b/data/conf/samples/ers_reload/second_reload/cgrates.json index 435245b76..7379c7e71 100644 --- a/data/conf/samples/ers_reload/second_reload/cgrates.json +++ b/data/conf/samples/ers_reload/second_reload/cgrates.json @@ -194,7 +194,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filtered_scheduler2_internal/cgrates.json b/data/conf/samples/filtered_scheduler2_internal/cgrates.json index 812716156..28a42828a 100644 --- a/data/conf/samples/filtered_scheduler2_internal/cgrates.json +++ b/data/conf/samples/filtered_scheduler2_internal/cgrates.json @@ -37,7 +37,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filtered_scheduler2_mongo/cgrates.json b/data/conf/samples/filtered_scheduler2_mongo/cgrates.json index c5032200e..080a9c84d 100644 --- a/data/conf/samples/filtered_scheduler2_mongo/cgrates.json +++ b/data/conf/samples/filtered_scheduler2_mongo/cgrates.json @@ -41,7 +41,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filtered_scheduler2_mysql/cgrates.json b/data/conf/samples/filtered_scheduler2_mysql/cgrates.json index a5728cada..6cdbb3d41 100644 --- a/data/conf/samples/filtered_scheduler2_mysql/cgrates.json +++ b/data/conf/samples/filtered_scheduler2_mysql/cgrates.json @@ -39,7 +39,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filtered_scheduler_internal/cgrates.json b/data/conf/samples/filtered_scheduler_internal/cgrates.json index 4ae6b26d1..629d91d10 100644 --- a/data/conf/samples/filtered_scheduler_internal/cgrates.json +++ b/data/conf/samples/filtered_scheduler_internal/cgrates.json @@ -37,7 +37,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filtered_scheduler_mongo/cgrates.json b/data/conf/samples/filtered_scheduler_mongo/cgrates.json index 95101b923..c51b3791b 100644 --- a/data/conf/samples/filtered_scheduler_mongo/cgrates.json +++ b/data/conf/samples/filtered_scheduler_mongo/cgrates.json @@ -41,7 +41,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filtered_scheduler_mysql/cgrates.json b/data/conf/samples/filtered_scheduler_mysql/cgrates.json index 25dcc0ea3..f342aef6c 100644 --- a/data/conf/samples/filtered_scheduler_mysql/cgrates.json +++ b/data/conf/samples/filtered_scheduler_mysql/cgrates.json @@ -39,7 +39,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filters/cgrates.json b/data/conf/samples/filters/cgrates.json index 50cb3cd4d..c42410302 100644 --- a/data/conf/samples/filters/cgrates.json +++ b/data/conf/samples/filters/cgrates.json @@ -64,7 +64,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["*localhost"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filters_gob/cgrates.json b/data/conf/samples/filters_gob/cgrates.json index 3ccbd8bcd..83f42d29b 100644 --- a/data/conf/samples/filters_gob/cgrates.json +++ b/data/conf/samples/filters_gob/cgrates.json @@ -71,7 +71,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filters_internal/cgrates.json b/data/conf/samples/filters_internal/cgrates.json index 4f809155b..62758502b 100644 --- a/data/conf/samples/filters_internal/cgrates.json +++ b/data/conf/samples/filters_internal/cgrates.json @@ -62,7 +62,8 @@ "store_interval": "-1", }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["*localhost"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filters_mongo/cgrates.json b/data/conf/samples/filters_mongo/cgrates.json index 26d0b7c66..74bbb092f 100644 --- a/data/conf/samples/filters_mongo/cgrates.json +++ b/data/conf/samples/filters_mongo/cgrates.json @@ -67,7 +67,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["*localhost"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/filters_mysql/cgrates.json b/data/conf/samples/filters_mysql/cgrates.json index 50cb3cd4d..c42410302 100644 --- a/data/conf/samples/filters_mysql/cgrates.json +++ b/data/conf/samples/filters_mysql/cgrates.json @@ -64,7 +64,8 @@ "store_interval": "1s", }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["*localhost"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/gocs/au_site/cgrates.json b/data/conf/samples/gocs/au_site/cgrates.json index 817b6ab3e..5ad6d3042 100644 --- a/data/conf/samples/gocs/au_site/cgrates.json +++ b/data/conf/samples/gocs/au_site/cgrates.json @@ -80,7 +80,8 @@ "chargers_conns": ["*internal"], }, - "apier": { + "apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["conn1"], } diff --git a/data/conf/samples/gocs/dsp_site/cgrates.json b/data/conf/samples/gocs/dsp_site/cgrates.json index 498973f08..d710f587c 100644 --- a/data/conf/samples/gocs/dsp_site/cgrates.json +++ b/data/conf/samples/gocs/dsp_site/cgrates.json @@ -42,7 +42,8 @@ "enabled": true }, - "apier": { + "apiers": { + "enabled": true, "scheduler_conns": ["*internal"] } diff --git a/data/conf/samples/gocs/us_site/cgrates.json b/data/conf/samples/gocs/us_site/cgrates.json index ad39221dc..87137eb80 100644 --- a/data/conf/samples/gocs/us_site/cgrates.json +++ b/data/conf/samples/gocs/us_site/cgrates.json @@ -99,7 +99,8 @@ }, - "apier": { + "apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["conn1"], }, diff --git a/data/conf/samples/httpagent_internal/cgrates.json b/data/conf/samples/httpagent_internal/cgrates.json index 9ec91f4cd..67721e58e 100644 --- a/data/conf/samples/httpagent_internal/cgrates.json +++ b/data/conf/samples/httpagent_internal/cgrates.json @@ -56,7 +56,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagent_internal_gob/cgrates.json b/data/conf/samples/httpagent_internal_gob/cgrates.json index 1d6e1ec7b..01a5e964c 100644 --- a/data/conf/samples/httpagent_internal_gob/cgrates.json +++ b/data/conf/samples/httpagent_internal_gob/cgrates.json @@ -63,7 +63,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagent_mongo/cgrates.json b/data/conf/samples/httpagent_mongo/cgrates.json index bce58861d..5ec49683e 100644 --- a/data/conf/samples/httpagent_mongo/cgrates.json +++ b/data/conf/samples/httpagent_mongo/cgrates.json @@ -59,7 +59,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagent_mongo_gob/cgrates.json b/data/conf/samples/httpagent_mongo_gob/cgrates.json index b13361087..1a6d8febe 100644 --- a/data/conf/samples/httpagent_mongo_gob/cgrates.json +++ b/data/conf/samples/httpagent_mongo_gob/cgrates.json @@ -65,7 +65,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagent_mysql/cgrates.json b/data/conf/samples/httpagent_mysql/cgrates.json index d2bc4b0a4..c05ff7a24 100644 --- a/data/conf/samples/httpagent_mysql/cgrates.json +++ b/data/conf/samples/httpagent_mysql/cgrates.json @@ -57,7 +57,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagent_mysql_gob/cgrates.json b/data/conf/samples/httpagent_mysql_gob/cgrates.json index e7a01bfc8..1e69fcbd5 100644 --- a/data/conf/samples/httpagent_mysql_gob/cgrates.json +++ b/data/conf/samples/httpagent_mysql_gob/cgrates.json @@ -64,7 +64,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagenttls_internal/cgrates.json b/data/conf/samples/httpagenttls_internal/cgrates.json index 466679457..5bd04a495 100755 --- a/data/conf/samples/httpagenttls_internal/cgrates.json +++ b/data/conf/samples/httpagenttls_internal/cgrates.json @@ -67,7 +67,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagenttls_internal_gob/cgrates.json b/data/conf/samples/httpagenttls_internal_gob/cgrates.json index acafbe97b..3a2ded0bb 100755 --- a/data/conf/samples/httpagenttls_internal_gob/cgrates.json +++ b/data/conf/samples/httpagenttls_internal_gob/cgrates.json @@ -76,7 +76,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagenttls_mongo/cgrates.json b/data/conf/samples/httpagenttls_mongo/cgrates.json index ee460ecfb..0f834ea4b 100755 --- a/data/conf/samples/httpagenttls_mongo/cgrates.json +++ b/data/conf/samples/httpagenttls_mongo/cgrates.json @@ -69,7 +69,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagenttls_mongo_gob/cgrates.json b/data/conf/samples/httpagenttls_mongo_gob/cgrates.json index 96b87ddbc..4ad859603 100755 --- a/data/conf/samples/httpagenttls_mongo_gob/cgrates.json +++ b/data/conf/samples/httpagenttls_mongo_gob/cgrates.json @@ -77,7 +77,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagenttls_mysql/cgrates.json b/data/conf/samples/httpagenttls_mysql/cgrates.json index 55cf8c726..25f7d966e 100755 --- a/data/conf/samples/httpagenttls_mysql/cgrates.json +++ b/data/conf/samples/httpagenttls_mysql/cgrates.json @@ -67,7 +67,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/httpagenttls_mysql_gob/cgrates.json b/data/conf/samples/httpagenttls_mysql_gob/cgrates.json index b2d84dd90..24de9df89 100755 --- a/data/conf/samples/httpagenttls_mysql_gob/cgrates.json +++ b/data/conf/samples/httpagenttls_mysql_gob/cgrates.json @@ -76,7 +76,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/internal_broadcast_replication/cgrates.json b/data/conf/samples/internal_broadcast_replication/cgrates.json index 28bc833c9..7d205bedd 100644 --- a/data/conf/samples/internal_broadcast_replication/cgrates.json +++ b/data/conf/samples/internal_broadcast_replication/cgrates.json @@ -105,7 +105,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["broadcast_conn"], }, diff --git a/data/conf/samples/internal_ttl_internal/cgrates.json b/data/conf/samples/internal_ttl_internal/cgrates.json index 90ae87bd1..c771ed70a 100644 --- a/data/conf/samples/internal_ttl_internal/cgrates.json +++ b/data/conf/samples/internal_ttl_internal/cgrates.json @@ -47,7 +47,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/loaders/tutmongo/cgrates.json b/data/conf/samples/loaders/tutmongo/cgrates.json index 107343c63..65988421f 100644 --- a/data/conf/samples/loaders/tutmongo/cgrates.json +++ b/data/conf/samples/loaders/tutmongo/cgrates.json @@ -157,7 +157,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/loaders/tutmysql/cgrates.json b/data/conf/samples/loaders/tutmysql/cgrates.json index a30852813..057adfdeb 100644 --- a/data/conf/samples/loaders/tutmysql/cgrates.json +++ b/data/conf/samples/loaders/tutmysql/cgrates.json @@ -155,7 +155,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/mongoatlas/cgrates.json b/data/conf/samples/mongoatlas/cgrates.json index 2e6f47f98..d988e5e64 100755 --- a/data/conf/samples/mongoatlas/cgrates.json +++ b/data/conf/samples/mongoatlas/cgrates.json @@ -153,7 +153,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/mongoreplica/cgrates.json b/data/conf/samples/mongoreplica/cgrates.json index 49ff460e4..5e008e014 100755 --- a/data/conf/samples/mongoreplica/cgrates.json +++ b/data/conf/samples/mongoreplica/cgrates.json @@ -108,7 +108,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/precache/tutmongo/cgrates.json b/data/conf/samples/precache/tutmongo/cgrates.json index de8aee208..0c242bb27 100644 --- a/data/conf/samples/precache/tutmongo/cgrates.json +++ b/data/conf/samples/precache/tutmongo/cgrates.json @@ -81,7 +81,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/precache/tutmysql/cgrates.json b/data/conf/samples/precache/tutmysql/cgrates.json index db6b57653..dcb6c383e 100644 --- a/data/conf/samples/precache/tutmysql/cgrates.json +++ b/data/conf/samples/precache/tutmysql/cgrates.json @@ -72,7 +72,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/radagent_internal/cgrates.json b/data/conf/samples/radagent_internal/cgrates.json index 50790d0fc..8a35386ec 100644 --- a/data/conf/samples/radagent_internal/cgrates.json +++ b/data/conf/samples/radagent_internal/cgrates.json @@ -152,7 +152,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/radagent_internal_gob/cgrates.json b/data/conf/samples/radagent_internal_gob/cgrates.json index af6a67e62..174c50b6f 100644 --- a/data/conf/samples/radagent_internal_gob/cgrates.json +++ b/data/conf/samples/radagent_internal_gob/cgrates.json @@ -160,7 +160,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/radagent_mongo/cgrates.json b/data/conf/samples/radagent_mongo/cgrates.json index 56da763c8..00332c125 100644 --- a/data/conf/samples/radagent_mongo/cgrates.json +++ b/data/conf/samples/radagent_mongo/cgrates.json @@ -155,7 +155,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/radagent_mongo_gob/cgrates.json b/data/conf/samples/radagent_mongo_gob/cgrates.json index 02738624c..16cc61a81 100644 --- a/data/conf/samples/radagent_mongo_gob/cgrates.json +++ b/data/conf/samples/radagent_mongo_gob/cgrates.json @@ -163,7 +163,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/radagent_mysql/cgrates.json b/data/conf/samples/radagent_mysql/cgrates.json index 540cbb331..830618383 100644 --- a/data/conf/samples/radagent_mysql/cgrates.json +++ b/data/conf/samples/radagent_mysql/cgrates.json @@ -151,7 +151,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/radagent_mysql_gob/cgrates.json b/data/conf/samples/radagent_mysql_gob/cgrates.json index bfe81aad1..a2f2e9162 100644 --- a/data/conf/samples/radagent_mysql_gob/cgrates.json +++ b/data/conf/samples/radagent_mysql_gob/cgrates.json @@ -158,7 +158,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/remote_replication/engine1_mongo/cgrates.json b/data/conf/samples/remote_replication/engine1_mongo/cgrates.json index 79bdb0c47..1ca49c2cc 100644 --- a/data/conf/samples/remote_replication/engine1_mongo/cgrates.json +++ b/data/conf/samples/remote_replication/engine1_mongo/cgrates.json @@ -35,7 +35,8 @@ "enabled": true, }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/remote_replication/engine1_redis/cgrates.json b/data/conf/samples/remote_replication/engine1_redis/cgrates.json index 1c77d4407..e2d4c6bf5 100644 --- a/data/conf/samples/remote_replication/engine1_redis/cgrates.json +++ b/data/conf/samples/remote_replication/engine1_redis/cgrates.json @@ -32,7 +32,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/remote_replication/engine2_mongo/cgrates.json b/data/conf/samples/remote_replication/engine2_mongo/cgrates.json index 153473409..1caa34dff 100644 --- a/data/conf/samples/remote_replication/engine2_mongo/cgrates.json +++ b/data/conf/samples/remote_replication/engine2_mongo/cgrates.json @@ -36,7 +36,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/remote_replication/engine2_redis/cgrates.json b/data/conf/samples/remote_replication/engine2_redis/cgrates.json index d040017ea..2dbeaca6f 100644 --- a/data/conf/samples/remote_replication/engine2_redis/cgrates.json +++ b/data/conf/samples/remote_replication/engine2_redis/cgrates.json @@ -32,7 +32,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/remote_replication/internal/cgrates.json b/data/conf/samples/remote_replication/internal/cgrates.json index 0597a980e..40ad81f57 100644 --- a/data/conf/samples/remote_replication/internal/cgrates.json +++ b/data/conf/samples/remote_replication/internal/cgrates.json @@ -89,7 +89,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/remote_replication/internal_gob/cgrates.json b/data/conf/samples/remote_replication/internal_gob/cgrates.json index de3b4e016..fc6681e61 100644 --- a/data/conf/samples/remote_replication/internal_gob/cgrates.json +++ b/data/conf/samples/remote_replication/internal_gob/cgrates.json @@ -95,7 +95,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/rpccaching_mongo/cgrates.json b/data/conf/samples/rpccaching_mongo/cgrates.json index bd4899bb5..1d22f1ae7 100644 --- a/data/conf/samples/rpccaching_mongo/cgrates.json +++ b/data/conf/samples/rpccaching_mongo/cgrates.json @@ -74,7 +74,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/rpccaching_mysql/cgrates.json b/data/conf/samples/rpccaching_mysql/cgrates.json index ac7b666af..26ad28730 100644 --- a/data/conf/samples/rpccaching_mysql/cgrates.json +++ b/data/conf/samples/rpccaching_mysql/cgrates.json @@ -64,7 +64,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessinternal/cgrates.json b/data/conf/samples/sessinternal/cgrates.json index 7643851ba..01db944b7 100644 --- a/data/conf/samples/sessinternal/cgrates.json +++ b/data/conf/samples/sessinternal/cgrates.json @@ -86,7 +86,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessintjson/cgrates.json b/data/conf/samples/sessintjson/cgrates.json index ad87241a2..62c75d99b 100644 --- a/data/conf/samples/sessintjson/cgrates.json +++ b/data/conf/samples/sessintjson/cgrates.json @@ -86,7 +86,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*localhost"], }, diff --git a/data/conf/samples/sessions/cgrates.json b/data/conf/samples/sessions/cgrates.json index efec2d2d4..8bf842b39 100644 --- a/data/conf/samples/sessions/cgrates.json +++ b/data/conf/samples/sessions/cgrates.json @@ -86,7 +86,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessions_internal/cgrates.json b/data/conf/samples/sessions_internal/cgrates.json index 81c0cb0ad..cdad285c8 100644 --- a/data/conf/samples/sessions_internal/cgrates.json +++ b/data/conf/samples/sessions_internal/cgrates.json @@ -90,7 +90,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessions_mongo/cgrates.json b/data/conf/samples/sessions_mongo/cgrates.json index 821c69d9a..1874cd812 100644 --- a/data/conf/samples/sessions_mongo/cgrates.json +++ b/data/conf/samples/sessions_mongo/cgrates.json @@ -95,7 +95,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessions_mysql/cgrates.json b/data/conf/samples/sessions_mysql/cgrates.json index ca719d27e..6ddf17fb5 100644 --- a/data/conf/samples/sessions_mysql/cgrates.json +++ b/data/conf/samples/sessions_mysql/cgrates.json @@ -91,7 +91,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json b/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json index 9a972c0f1..b70e32726 100644 --- a/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcmaster_mongo/cgrates.json @@ -65,7 +65,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json b/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json index ed6b868a4..9d9f3a2df 100644 --- a/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcmaster_mysql/cgrates.json @@ -56,7 +56,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json b/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json index 5b674c4e1..127cb1cb0 100644 --- a/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcslave_mongo/cgrates.json @@ -70,7 +70,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json b/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json index 825e0cbb9..3bdabaa7b 100644 --- a/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json +++ b/data/conf/samples/sessions_replication/smgreplcslave_mysql/cgrates.json @@ -61,7 +61,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_automatic_debits_internal/cgrates.json b/data/conf/samples/smg_automatic_debits_internal/cgrates.json index fce978556..5e98c9964 100644 --- a/data/conf/samples/smg_automatic_debits_internal/cgrates.json +++ b/data/conf/samples/smg_automatic_debits_internal/cgrates.json @@ -46,7 +46,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_automatic_debits_mongo/cgrates.json b/data/conf/samples/smg_automatic_debits_mongo/cgrates.json index 30d2f543d..42532ab8e 100644 --- a/data/conf/samples/smg_automatic_debits_mongo/cgrates.json +++ b/data/conf/samples/smg_automatic_debits_mongo/cgrates.json @@ -51,7 +51,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_automatic_debits_mysql/cgrates.json b/data/conf/samples/smg_automatic_debits_mysql/cgrates.json index 4fd47f133..7d1c99173 100644 --- a/data/conf/samples/smg_automatic_debits_mysql/cgrates.json +++ b/data/conf/samples/smg_automatic_debits_mysql/cgrates.json @@ -47,7 +47,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_internal/cgrates.json b/data/conf/samples/smg_internal/cgrates.json index 1d48b7f36..05f686459 100644 --- a/data/conf/samples/smg_internal/cgrates.json +++ b/data/conf/samples/smg_internal/cgrates.json @@ -69,7 +69,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_internal_gob/cgrates.json b/data/conf/samples/smg_internal_gob/cgrates.json index 6e99095b8..db7f064ef 100644 --- a/data/conf/samples/smg_internal_gob/cgrates.json +++ b/data/conf/samples/smg_internal_gob/cgrates.json @@ -76,7 +76,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_mongo/cgrates.json b/data/conf/samples/smg_mongo/cgrates.json index 006cb7a9e..caff0235d 100644 --- a/data/conf/samples/smg_mongo/cgrates.json +++ b/data/conf/samples/smg_mongo/cgrates.json @@ -73,7 +73,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_mongo_gob/cgrates.json b/data/conf/samples/smg_mongo_gob/cgrates.json index 002c1b22d..0c06dc028 100644 --- a/data/conf/samples/smg_mongo_gob/cgrates.json +++ b/data/conf/samples/smg_mongo_gob/cgrates.json @@ -80,7 +80,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_mysql/cgrates.json b/data/conf/samples/smg_mysql/cgrates.json index 7116cf87b..7f1d7170f 100644 --- a/data/conf/samples/smg_mysql/cgrates.json +++ b/data/conf/samples/smg_mysql/cgrates.json @@ -69,7 +69,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smg_mysql_gob/cgrates.json b/data/conf/samples/smg_mysql_gob/cgrates.json index 4ce9cbacd..29cc00172 100644 --- a/data/conf/samples/smg_mysql_gob/cgrates.json +++ b/data/conf/samples/smg_mysql_gob/cgrates.json @@ -76,7 +76,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgeneric_mysql/cgrates.json b/data/conf/samples/smgeneric_mysql/cgrates.json index d9aa216a2..18ffa7597 100644 --- a/data/conf/samples/smgeneric_mysql/cgrates.json +++ b/data/conf/samples/smgeneric_mysql/cgrates.json @@ -65,7 +65,8 @@ "enabled": true, // starts User service: . }, -"apier": { +"apiers": { + "enabled": true, "caches_conns":["conn1"], "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcmaster_mongo/cgrates.json b/data/conf/samples/smgreplcmaster_mongo/cgrates.json index 9d49b8a87..22d9fe19c 100644 --- a/data/conf/samples/smgreplcmaster_mongo/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mongo/cgrates.json @@ -64,7 +64,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json b/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json index 4d27b8425..a8354daf5 100644 --- a/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mongo_gob/cgrates.json @@ -64,7 +64,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcmaster_mysql/cgrates.json b/data/conf/samples/smgreplcmaster_mysql/cgrates.json index 85255d3c4..f979e4758 100644 --- a/data/conf/samples/smgreplcmaster_mysql/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mysql/cgrates.json @@ -55,7 +55,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json b/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json index 3e54425f2..63d67116b 100644 --- a/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json +++ b/data/conf/samples/smgreplcmaster_mysql_gob/cgrates.json @@ -55,7 +55,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcslave_mongo/cgrates.json b/data/conf/samples/smgreplcslave_mongo/cgrates.json index fe0803ca0..fd313f34b 100644 --- a/data/conf/samples/smgreplcslave_mongo/cgrates.json +++ b/data/conf/samples/smgreplcslave_mongo/cgrates.json @@ -69,7 +69,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json b/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json index 2dcd47c12..0bbc5aa51 100644 --- a/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json +++ b/data/conf/samples/smgreplcslave_mongo_gob/cgrates.json @@ -68,7 +68,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcslave_mysql/cgrates.json b/data/conf/samples/smgreplcslave_mysql/cgrates.json index 4fc8609bd..b9113ca2d 100644 --- a/data/conf/samples/smgreplcslave_mysql/cgrates.json +++ b/data/conf/samples/smgreplcslave_mysql/cgrates.json @@ -59,7 +59,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json b/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json index 88e7221c7..07baae109 100644 --- a/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json +++ b/data/conf/samples/smgreplcslave_mysql_gob/cgrates.json @@ -58,7 +58,8 @@ "chargers_conns": ["*internal"], }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutinternal/cgrates.json b/data/conf/samples/tutinternal/cgrates.json index 94f18bfab..0e356f187 100644 --- a/data/conf/samples/tutinternal/cgrates.json +++ b/data/conf/samples/tutinternal/cgrates.json @@ -94,7 +94,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutinternal_gob/cgrates.json b/data/conf/samples/tutinternal_gob/cgrates.json index 10a846fd7..f10c01002 100644 --- a/data/conf/samples/tutinternal_gob/cgrates.json +++ b/data/conf/samples/tutinternal_gob/cgrates.json @@ -100,7 +100,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["conn1"], }, diff --git a/data/conf/samples/tutinternal_new/cgrates.json b/data/conf/samples/tutinternal_new/cgrates.json index 69aac3999..bb1565d35 100644 --- a/data/conf/samples/tutinternal_new/cgrates.json +++ b/data/conf/samples/tutinternal_new/cgrates.json @@ -113,7 +113,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmongo/cgrates.json b/data/conf/samples/tutmongo/cgrates.json index d33804425..ecf68f12f 100644 --- a/data/conf/samples/tutmongo/cgrates.json +++ b/data/conf/samples/tutmongo/cgrates.json @@ -124,7 +124,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmongo2/cgrates.json b/data/conf/samples/tutmongo2/cgrates.json index 9b5e37820..3811fe4bb 100644 --- a/data/conf/samples/tutmongo2/cgrates.json +++ b/data/conf/samples/tutmongo2/cgrates.json @@ -129,7 +129,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmongo2_gob/cgrates.json b/data/conf/samples/tutmongo2_gob/cgrates.json index a3d1ce0ee..b3525523b 100644 --- a/data/conf/samples/tutmongo2_gob/cgrates.json +++ b/data/conf/samples/tutmongo2_gob/cgrates.json @@ -136,7 +136,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmongo_gob/cgrates.json b/data/conf/samples/tutmongo_gob/cgrates.json index 7ede59603..2df9ca520 100644 --- a/data/conf/samples/tutmongo_gob/cgrates.json +++ b/data/conf/samples/tutmongo_gob/cgrates.json @@ -131,7 +131,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmongonew/cgrates.json b/data/conf/samples/tutmongonew/cgrates.json index 25f567e84..f8597d417 100644 --- a/data/conf/samples/tutmongonew/cgrates.json +++ b/data/conf/samples/tutmongonew/cgrates.json @@ -121,7 +121,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmysql/cgrates.json b/data/conf/samples/tutmysql/cgrates.json index c0f88443a..b498f79b8 100644 --- a/data/conf/samples/tutmysql/cgrates.json +++ b/data/conf/samples/tutmysql/cgrates.json @@ -121,7 +121,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutmysql2/cgrates.json b/data/conf/samples/tutmysql2/cgrates.json index 327fa0482..fd7b7a067 100644 --- a/data/conf/samples/tutmysql2/cgrates.json +++ b/data/conf/samples/tutmysql2/cgrates.json @@ -95,7 +95,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*localhost"], }, } diff --git a/data/conf/samples/tutmysql2_gob/cgrates.json b/data/conf/samples/tutmysql2_gob/cgrates.json index 43634561f..e05cec497 100644 --- a/data/conf/samples/tutmysql2_gob/cgrates.json +++ b/data/conf/samples/tutmysql2_gob/cgrates.json @@ -104,7 +104,8 @@ -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } diff --git a/data/conf/samples/tutmysql_internal/cgrates.json b/data/conf/samples/tutmysql_internal/cgrates.json index afc4fbe6e..cd8ff7450 100644 --- a/data/conf/samples/tutmysql_internal/cgrates.json +++ b/data/conf/samples/tutmysql_internal/cgrates.json @@ -234,7 +234,8 @@ }, -"apier": { +"apiers": { + "enabled": true,"enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/conf/samples/tutpostgres/cgrates.json b/data/conf/samples/tutpostgres/cgrates.json index 197b7d592..4f030d866 100644 --- a/data/conf/samples/tutpostgres/cgrates.json +++ b/data/conf/samples/tutpostgres/cgrates.json @@ -93,7 +93,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } diff --git a/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json index ccbb8e692..f618baeb7 100644 --- a/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorial_tests/asterisk_ari/cgrates/etc/cgrates/cgrates.json @@ -108,7 +108,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, } diff --git a/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json index d4ddc6c01..6c4883d65 100644 --- a/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorial_tests/fs_evsock/cgrates/etc/cgrates/cgrates.json @@ -106,7 +106,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json index 707580b75..06c81fafa 100644 --- a/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorial_tests/kamevapi/cgrates/etc/cgrates/cgrates.json @@ -106,7 +106,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json b/data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json index 10f3c519d..af139cbbe 100644 --- a/data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorial_tests/osips/cgrates/etc/cgrates/cgrates.json @@ -98,7 +98,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json index cb167a753..ecfd58213 100644 --- a/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/asterisk_ari/cgrates/etc/cgrates/cgrates.json @@ -107,7 +107,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json b/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json index d4ddc6c01..6c4883d65 100644 --- a/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/fs_evsock/cgrates/etc/cgrates/cgrates.json @@ -106,7 +106,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json index 4630f4e4c..4cb54b397 100644 --- a/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/kamevapi/cgrates/etc/cgrates/cgrates.json @@ -106,7 +106,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json b/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json index 41b7c91d7..df93c70e9 100644 --- a/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json +++ b/data/tutorials/osips/cgrates/etc/cgrates/cgrates.json @@ -97,7 +97,8 @@ }, -"apier": { +"apiers": { + "enabled": true, "scheduler_conns": ["*internal"], }, diff --git a/services/apierv1.go b/services/apierv1.go index 14ef20f1b..23d57087b 100644 --- a/services/apierv1.go +++ b/services/apierv1.go @@ -48,6 +48,7 @@ func NewApierV1Service(cfg *config.CGRConfig, dm *DataDBService, schedService: schedService, responderService: responderService, connMgr: connMgr, + apierV1Chan: make(chan *v1.ApierV1, 1), } } @@ -67,6 +68,8 @@ type ApierV1Service struct { connChan chan rpcclient.ClientConnector syncStop chan struct{} + + apierV1Chan chan *v1.ApierV1 } // Start should handle the sercive start @@ -121,6 +124,7 @@ func (apiService *ApierV1Service) Start() (err error) { apiService.connChan <- apiService.api + apiService.apierV1Chan <- apiService.api return } @@ -167,3 +171,10 @@ func (apiService *ApierV1Service) GetApierV1() *v1.ApierV1 { func (apiService *ApierV1Service) ShouldRun() bool { return apiService.cfg.RalsCfg().Enabled } + +// GetDMChan returns the DataManager chanel +func (apiService *ApierV1Service) GetApierV1Chan() chan *v1.ApierV1 { + apiService.RLock() + defer apiService.RUnlock() + return apiService.apierV1Chan +} diff --git a/services/apierv2.go b/services/apierv2.go index b57f4f5db..c7e141073 100644 --- a/services/apierv2.go +++ b/services/apierv2.go @@ -31,10 +31,10 @@ import ( // NewApierV2Service returns the ApierV2 Service func NewApierV2Service(apiv1 *ApierV1Service, cfg *config.CGRConfig, server *utils.Server, - internalAPIerV1Chan chan rpcclient.ClientConnector) *ApierV2Service { + internalAPIerV2Chan chan rpcclient.ClientConnector) *ApierV2Service { return &ApierV2Service{ apiv1: apiv1, - connChan: internalAPIerV1Chan, + connChan: internalAPIerV2Chan, cfg: cfg, server: server, } @@ -58,11 +58,15 @@ func (api *ApierV2Service) Start() (err error) { return fmt.Errorf("service aleady running") } + apiV1Chan := api.apiv1.GetApierV1Chan() + apiV1 := <-apiV1Chan + apiV1Chan <- apiV1 + api.Lock() defer api.Unlock() api.api = &v2.ApierV2{ - ApierV1: *api.apiv1.GetApierV1(), + ApierV1: *apiV1, } if !api.cfg.DispatcherSCfg().Enabled { diff --git a/services/rals.go b/services/rals.go index 2dc21fa89..0b746c776 100644 --- a/services/rals.go +++ b/services/rals.go @@ -31,21 +31,16 @@ import ( ) // NewRalService returns the Ral Service -func NewRalService(cfg *config.CGRConfig, dm *DataDBService, - storDB *StorDBService, cacheS *engine.CacheS, filterSChan chan *engine.FilterS, server *utils.Server, - internalRALsChan, internalResponderChan, internalAPIerV1Chan, internalAPIerV2Chan chan rpcclient.ClientConnector, - schedulerService *SchedulerService, exitChan chan bool, +func NewRalService(cfg *config.CGRConfig, cacheS *engine.CacheS, server *utils.Server, + internalRALsChan, internalResponderChan chan rpcclient.ClientConnector, exitChan chan bool, connMgr *engine.ConnManager) *RalService { resp := NewResponderService(cfg, server, internalResponderChan, exitChan) - apiv1 := NewApierV1Service(cfg, dm, storDB, filterSChan, server, schedulerService, resp, internalAPIerV1Chan, connMgr) - apiv2 := NewApierV2Service(apiv1, cfg, server, internalAPIerV2Chan) + return &RalService{ connChan: internalRALsChan, cfg: cfg, cacheS: cacheS, server: server, - apiv1: apiv1, - apiv2: apiv2, responder: resp, connMgr: connMgr, } @@ -58,8 +53,6 @@ type RalService struct { cacheS *engine.CacheS server *utils.Server rals *v1.RALsV1 - apiv1 *ApierV1Service - apiv2 *ApierV2Service responder *ResponderService connChan chan rpcclient.ClientConnector connMgr *engine.ConnManager @@ -90,14 +83,6 @@ func (rals *RalService) Start() (err error) { return } - if err = rals.apiv1.Start(); err != nil { - return - } - - if err = rals.apiv2.Start(); err != nil { - return - } - rals.rals = v1.NewRALsV1() if !rals.cfg.DispatcherSCfg().Enabled { @@ -118,12 +103,6 @@ func (rals *RalService) GetIntenternalChan() (conn chan rpcclient.ClientConnecto // Reload handles the change of config func (rals *RalService) Reload() (err error) { engine.SetRpSubjectPrefixMatching(rals.cfg.RalsCfg().RpSubjectPrefixMatching) - if err = rals.apiv1.Reload(); err != nil { - return - } - if err = rals.apiv2.Reload(); err != nil { - return - } if err = rals.responder.Reload(); err != nil { return } @@ -134,12 +113,6 @@ func (rals *RalService) Reload() (err error) { func (rals *RalService) Shutdown() (err error) { rals.Lock() defer rals.Unlock() - if err = rals.apiv1.Shutdown(); err != nil { - return - } - if err = rals.apiv2.Shutdown(); err != nil { - return - } if err = rals.responder.Shutdown(); err != nil { return } @@ -165,17 +138,12 @@ func (rals *RalService) ShouldRun() bool { return rals.cfg.RalsCfg().Enabled } -// GetAPIv1 returns the apiv1 service -func (rals *RalService) GetAPIv1() servmanager.Service { - return rals.apiv1 -} - -// GetAPIv2 returns the apiv2 service -func (rals *RalService) GetAPIv2() servmanager.Service { - return rals.apiv2 -} - // GetResponder returns the responder service func (rals *RalService) GetResponder() servmanager.Service { return rals.responder } + +// GetResponder returns the responder service +func (rals *RalService) GetResponderService() *ResponderService { + return rals.responder +} diff --git a/servmanager/servmanager.go b/servmanager/servmanager.go index 9300dba9d..b00279673 100644 --- a/servmanager/servmanager.go +++ b/servmanager/servmanager.go @@ -147,6 +147,8 @@ func (srvMngr *ServiceManager) GetConfig() *config.CGRConfig { func (srvMngr *ServiceManager) StartServices() (err error) { go srvMngr.handleReload() for serviceName, shouldRun := range map[string]bool{ + utils.ApierV1: srvMngr.GetConfig().ApierCfg().Enabled, + utils.ApierV2: srvMngr.GetConfig().ApierCfg().Enabled, utils.StorDB: srvMngr.GetConfig().RalsCfg().Enabled || srvMngr.GetConfig().CdrsCfg().Enabled, utils.AttributeS: srvMngr.GetConfig().AttributeSCfg().Enabled, utils.ChargerS: srvMngr.GetConfig().ChargerSCfg().Enabled, @@ -197,9 +199,7 @@ func (srvMngr *ServiceManager) handleReload() { case ext := <-srvMngr.engineShutdown: srvMngr.engineShutdown <- ext for srviceName, srv := range srvMngr.subsystems { // gracefully stop all running subsystems - if !srv.IsRunning() || - srv.ServiceName() == utils.ApierV1 || // apierv1 and apierv2 shutdown is handled by RaLs - srv.ServiceName() == utils.ApierV2 { // remove this once aqier is no longer dependent on RaLs + if !srv.IsRunning() { continue } if err := srv.Shutdown(); err != nil { @@ -240,7 +240,7 @@ func (srvMngr *ServiceManager) handleReload() { if err = srvMngr.reloadService(utils.RALService); err != nil { return } - case <-srvMngr.GetConfig().GetReloadChan(config.Apier): + case <-srvMngr.GetConfig().GetReloadChan(config.ApierS): if err = srvMngr.reloadService(utils.ApierV1); err != nil { return } diff --git a/utils/consts.go b/utils/consts.go index 76f332861..caed04700 100755 --- a/utils/consts.go +++ b/utils/consts.go @@ -682,6 +682,7 @@ const ( CDRServer = "CDRServer" ResponderS = "ResponderS" GuardianS = "GuardianS" + ApierS = "ApierS" ) // Lower service names @@ -699,6 +700,7 @@ const ( LoaderSLow = "loaders" RALsLow = "rals" ReplicatorLow = "replicator" + ApierSLow = "apiers" ) // Actions