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

Added a new configuration option in ers, row_length

Browse Source
This commit is contained in:
adragusin
2020-03-31 13:51:05 +03:00
committed by Dan Christian Bogos
parent c6cc4b2287
commit 16d25cc6cb
18 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/config_defaults.go
View File

@@ -300,6 +300,7 @@ const CGRATES_CFG_JSON = `
"ers": { // EventReaderService
"enabled": false, // starts the EventReader service: <true|false>
"sessions_conns":["*internal"], // RPC Connections IDs
"row_length" : 0, // Number of fields from csv file
"readers": [
{
"id": "*default", // identifier of the EventReader profile

1
config/erscfg.go
View File

@@ -27,6 +27,7 @@ import (
type ERsCfg struct {
Enabled bool
SessionSConns []string
RowLength int
Readers []*EventReaderCfg
}

3
config/erscfg_test.go
View File

@@ -183,6 +183,7 @@ func TestEventReaderLoadFromJSON(t *testing.T) {
"ers": {
"enabled": true,
"sessions_conns":["conn1","conn3"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",
@@ -208,6 +209,7 @@ func TestEventReaderSanitization(t *testing.T) {
cfgJSONStr := `{
"ers": {
"enabled": true,
"row_length" : 0,
"readers": [
{
"id": "file_reader1",
@@ -295,6 +297,7 @@ func TestEventReaderSameID(t *testing.T) {
"ers": {
"enabled": true,
"sessions_conns":["conn1"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/cgrates/cgrates.json
View File

@@ -279,6 +279,7 @@
// "ers": { // EventReaderService
// "enabled": false, // starts the EventReader service: <true|false>
// "sessions_conns":["*internal"], // RPC Connections IDs
// "row_length" : 0,
// "readers": [
// {
// "id": "*default", // identifier of the EventReader profile

1
data/conf/samples/ers_example/cgrates.json
View File

@@ -67,6 +67,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*localhost"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/samples/ers_internal/cgrates.json
View File

@@ -77,6 +77,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*internal"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/samples/ers_mongo/cgrates.json
View File

@@ -78,6 +78,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*internal"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/samples/ers_mysql/cgrates.json
View File

@@ -75,6 +75,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*internal"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/samples/ers_postgres/cgrates.json
View File

@@ -72,6 +72,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*internal"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/samples/ers_reload/first_reload/cgrates.json
View File

@@ -67,6 +67,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*localhost"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/samples/ers_reload/internal/cgrates.json
View File

@@ -67,6 +67,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*internal"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
data/conf/samples/ers_reload/second_reload/cgrates.json
View File

@@ -67,6 +67,7 @@
"ers": {
"enabled": true,
"sessions_conns": ["*localhost"],
"row_length" : 0,
"readers": [
{
"id": "file_reader1",

1
docs/ers.rst
View File

@@ -33,6 +33,7 @@ With explanations in the comments:
"ers": {
"enabled": true, // enable the service
"sessions_conns": ["*internal"], // connection towards SessionS
"row_length" : 0, // Number of fields from csv file
"readers": [ // list of active readers
{
"id": "file_reader2", // file_reader2 reader

1
ers/filecsv.go
View File

@@ -130,6 +130,7 @@ func (rdr *CSVFileER) processFile(fPath, fName string) (err error) {
}
defer file.Close()
csvReader := csv.NewReader(bufio.NewReader(file))
csvReader.FieldsPerRecord = rdr.cgrCfg.ERsCfg().RowLength
csvReader.Comma = utils.CSV_SEP
if len(rdr.Config().FieldSep) > 0 {
csvReader.Comma = rune(rdr.Config().FieldSep[0])

1
ers/flatstore.go
View File

@@ -137,6 +137,7 @@ func (rdr *FlatstoreER) processFile(fPath, fName string) (err error) {
}
defer file.Close()
csvReader := csv.NewReader(bufio.NewReader(file))
csvReader.FieldsPerRecord = rdr.cgrCfg.ERsCfg().RowLength
csvReader.Comma = ','
if len(rdr.Config().FieldSep) > 0 {
csvReader.Comma = rune(rdr.Config().FieldSep[0])

1
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>
"row_length" : 0,
"readers": [
{
"id": "kafka", // identifier of the EventReader profile

1
ers/partial_csv.go
View File

@@ -144,6 +144,7 @@ func (rdr *PartialCSVFileER) processFile(fPath, fName string) (err error) {
}
defer file.Close()
csvReader := csv.NewReader(bufio.NewReader(file))
csvReader.FieldsPerRecord = rdr.cgrCfg.ERsCfg().RowLength
csvReader.Comma = ','
if len(rdr.Config().FieldSep) > 0 {
csvReader.Comma = rune(rdr.Config().FieldSep[0])

1
ers/sql_it_test.go
View File

@@ -73,6 +73,7 @@ func testSQLInitConfig(t *testing.T) {
},
"ers": { // EventReaderService
"enabled": true, // starts the EventReader service: <true|false>
"row_length" : 0,
"readers": [
{
"id": "mysql", // identifier of the EventReader profile