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 check config sanity. Fixes #3008

Browse Source
This commit is contained in:
Trial97
2021-05-28 13:01:28 +03:00
committed by Dan Christian Bogos
parent b232fac008
commit 40d3f5f196
7 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.go
View File

@@ -320,7 +320,8 @@ var posibleLoaderTypes = utils.NewStringSet([]string{utils.MetaAttributes,
var possibleReaderTypes = utils.NewStringSet([]string{utils.MetaFileCSV,
utils.MetaKafkajsonMap, utils.MetaFileXML, utils.MetaSQL, utils.MetaFileFWV,
utils.MetaFileJSON, utils.MetaNone})
utils.MetaFileJSON, utils.MetaNone, utils.MetaAMQPjsonMap, utils.MetaS3jsonMap,
utils.MetaSQSjsonMap, utils.MetaAMQPV1jsonMap})
var possibleExporterTypes = utils.NewStringSet([]string{utils.MetaFileCSV, utils.MetaNone, utils.MetaFileFWV,
utils.MetaHTTPPost, utils.MetaHTTPjsonMap, utils.MetaAMQPjsonMap, utils.MetaAMQPV1jsonMap, utils.MetaSQSjsonMap,

4
ers/amqp_it_test.go
View File

@@ -36,6 +36,7 @@ func TestAMQPER(t *testing.T) {
cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{
"ers": { // EventReaderService
"enabled": true, // starts the EventReader service: <true|false>
"sessions_conns":["*localhost"],
"readers": [
{
"id": "amqp", // identifier of the EventReader profile
@@ -64,6 +65,9 @@ func TestAMQPER(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := cfg.CheckConfigSanity(); err != nil {
t.Fatal(err)
}
utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID)
utils.Logger.SetLogLevel(7)

4
ers/amqpv1_it_test.go
View File

@@ -45,6 +45,7 @@ func TestAMQPERv1(t *testing.T) {
cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{
"ers": { // EventReaderService
"enabled": true, // starts the EventReader service: <true|false>
"sessions_conns":["*localhost"],
"readers": [
{
"id": "amqpv1", // identifier of the EventReader profile
@@ -69,6 +70,9 @@ func TestAMQPERv1(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := cfg.CheckConfigSanity(); err != nil {
t.Fatal(err)
}
utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID)
utils.Logger.SetLogLevel(7)

5
ers/kafka_it_test.go
View File

@@ -44,6 +44,7 @@ func TestKafkaER(t *testing.T) {
cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{
"ers": { // EventReaderService
"enabled": true, // starts the EventReader service: <true|false>
"sessions_conns":["*localhost"],
"readers": [
{
"id": "kafka", // identifier of the EventReader profile
@@ -65,7 +66,9 @@ func TestKafkaER(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := cfg.CheckConfigSanity(); err != nil {
t.Fatal(err)
}
rdrEvents = make(chan *erEvent, 1)
rdrErr = make(chan error, 1)
rdrExit = make(chan struct{}, 1)

5
ers/s3_it_test.go
View File

@@ -48,6 +48,7 @@ func TestS3ER(t *testing.T) {
cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{
"ers": { // EventReaderService
"enabled": true, // starts the EventReader service: <true|false>
"sessions_conns":["*localhost"],
"readers": [
{
"id": "s3", // identifier of the EventReader profile
@@ -76,7 +77,9 @@ func TestS3ER(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := cfg.CheckConfigSanity(); err != nil {
t.Fatal(err)
}
rdrEvents = make(chan *erEvent, 1)
rdrErr = make(chan error, 1)
rdrExit = make(chan struct{}, 1)

4
ers/sql_it_test.go
View File

@@ -90,6 +90,7 @@ func testSQLInitConfig(t *testing.T) {
},
"ers": { // EventReaderService
"enabled": true, // starts the EventReader service: <true|false>
"sessions_conns":["*localhost"],
"readers": [
{
"id": "mysql", // identifier of the EventReader profile
@@ -115,6 +116,9 @@ func testSQLInitConfig(t *testing.T) {
}`); err != nil {
t.Fatal(err)
}
if err := sqlCfg.CheckConfigSanity(); err != nil {
t.Fatal(err)
}
utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, sqlCfg.GeneralCfg().NodeID)
utils.Logger.SetLogLevel(7)
}

5
ers/sqs_it_test.go
View File

@@ -47,6 +47,7 @@ func TestSQSER(t *testing.T) {
cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{
"ers": { // EventReaderService
"enabled": true, // starts the EventReader service: <true|false>
"sessions_conns":["*localhost"],
"readers": [
{
"id": "sqs", // identifier of the EventReader profile
@@ -75,7 +76,9 @@ func TestSQSER(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if err := cfg.CheckConfigSanity(); err != nil {
t.Fatal(err)
}
rdrEvents = make(chan *erEvent, 1)
rdrErr = make(chan error, 1)
rdrExit = make(chan struct{}, 1)