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

Make changes in ees based on staticcheck flags

Browse Source
This commit is contained in:
ionutboangiu
2021-04-01 17:08:35 +03:00
committed by Dan Christian Bogos
parent a19093e95b
commit 7e09dfc6da
14 changed files with 73 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ees/ee_test.go
View File

@@ -110,6 +110,9 @@ func TestNewEventExporterCase3(t *testing.T) {
"Local",
utils.EmptyString,
))
if err != nil {
t.Error(err)
}
eeExpect, err := NewHTTPPostEe(cgrCfg, 0, filterS, dc)
if err != nil {
t.Error(err)
@@ -134,6 +137,9 @@ func TestNewEventExporterCase4(t *testing.T) {
"Local",
utils.EmptyString,
))
if err != nil {
t.Error(err)
}
eeExpect, err := NewHTTPjsonMapEE(cgrCfg, 0, filterS, dc)
if err != nil {
t.Error(err)
@@ -158,6 +164,9 @@ func TestNewEventExporterCase5(t *testing.T) {
"Local",
utils.EmptyString,
))
if err != nil {
t.Error(err)
}
eeExpect, err := NewPosterJSONMapEE(cgrCfg, 0, filterS, dc)
if err != nil {
t.Error(err)

1
ees/ees.go
View File

@@ -125,7 +125,6 @@ func (eeS *EventExporterS) attrSProcessEvent(cgrEv *utils.CGREvent, attrIDs []st
eeS.cfg.EEsNoLksCfg().AttributeSConns, nil,
utils.AttributeSv1ProcessEvent,
attrArgs, &rplyEv); err == nil && len(rplyEv.AlteredFields) != 0 {
cgrEv = rplyEv.CGREvent
} else if err != nil &&
err.Error() == utils.ErrNotFound.Error() {
err = nil // cancel ErrNotFound

2
ees/ees_test.go
View File

@@ -54,7 +54,7 @@ func TestListenAndServe(t *testing.T) {
cfgRld := make(chan struct{}, 1)
cfgRld <- struct{}{}
go func() {
time.Sleep(10)
time.Sleep(10 * time.Nanosecond)
stopChan <- struct{}{}
}()
var err error

2
ees/elastic.go
View File

@@ -119,7 +119,7 @@ func (eEe *ElasticEe) ID() string {
// OnEvicted implements EventExporter, doing the cleanup before exit
func (eEe *ElasticEe) OnEvicted(_ string, _ interface{}) {
return
}
// ExportEvent implements EventExporter

1
ees/filecsv.go
View File

@@ -88,7 +88,6 @@ func (fCsv *FileCSVee) OnEvicted(_ string, _ interface{}) {
utils.Logger.Warning(fmt.Sprintf("<%s> Exporter with id: <%s> received error: <%s> when closing the file",
utils.EventExporterS, fCsv.id, err.Error()))
}
return
}
// ExportEvent implements EventExporter

1
ees/filefwv.go
View File

@@ -78,7 +78,6 @@ func (fFwv *FileFWVee) OnEvicted(_ string, _ interface{}) {
utils.Logger.Warning(fmt.Sprintf("<%s> Exporter with id: <%s> received error: <%s> when closing the file",
utils.EventExporterS, fFwv.id, err.Error()))
}
return
}
// ExportEvent implements EventExporter

1
ees/httpjsonmap.go
View File

@@ -64,7 +64,6 @@ func (httpEE *HTTPjsonMapEE) ID() string {
// OnEvicted implements EventExporter, doing the cleanup before exit
func (httpEE *HTTPjsonMapEE) OnEvicted(string, interface{}) {
return
}
// ExportEvent implements EventExporter

9
ees/httpjsonmap_test.go
View File

@@ -159,6 +159,9 @@ func TestHttpJsonMapExportEvent3(t *testing.T) {
"Local",
utils.EmptyString,
))
if err != nil {
t.Error(err)
}
httpEE, err := NewHTTPjsonMapEE(cgrCfg, 0, filterS, dc)
if err != nil {
t.Error(err)
@@ -202,6 +205,9 @@ func TestHttpJsonMapExportEvent4(t *testing.T) {
"Local",
utils.EmptyString,
))
if err != nil {
t.Error(err)
}
httpEE, err := NewHTTPjsonMapEE(cgrCfg, 0, filterS, dc)
if err != nil {
t.Error(err)
@@ -249,6 +255,9 @@ func TestHttpJsonMapExportEvent5(t *testing.T) {
"Local",
utils.EmptyString,
))
if err != nil {
t.Error(err)
}
httpEE, err := NewHTTPjsonMapEE(cgrCfg, 0, filterS, dc)
if err != nil {
t.Error(err)

1
ees/httppost.go
View File

@@ -58,7 +58,6 @@ func (httpPost *HTTPPost) ID() string {
// OnEvicted implements EventExporter, doing the cleanup before exit
func (httpPost *HTTPPost) OnEvicted(_ string, _ interface{}) {
return
}
// ExportEvent implements EventExporter

1
ees/posterjsonmap.go
View File

@@ -76,7 +76,6 @@ func (pstrEE *PosterJSONMapEE) ID() string {
// OnEvicted implements EventExporter, doing the cleanup before exit
func (pstrEE *PosterJSONMapEE) OnEvicted(string, interface{}) {
pstrEE.poster.Close()
return
}
// ExportEvent implements EventExporter

4
ees/sql.go
View File

@@ -39,7 +39,7 @@ func NewSQLEe(cgrCfg *config.CGRConfig, cfgIdx int, filterS *engine.FilterS,
sqlEe = &SQLEe{id: cgrCfg.EEsCfg().Exporters[cfgIdx].ID,
cgrCfg: cgrCfg, cfgIdx: cfgIdx, filterS: filterS, dc: dc}
dialect, err := sqlEe.NewSQLEeUrl(cgrCfg)
dialect, err := sqlEe.NewSQLEeURL(cgrCfg)
if err != nil {
return
}
@@ -62,7 +62,7 @@ type SQLEe struct {
dc utils.MapStorage
}
func (sqlEe *SQLEe) NewSQLEeUrl(cgrCfg *config.CGRConfig) (dialect gorm.Dialector, err error) {
func (sqlEe *SQLEe) NewSQLEeURL(cgrCfg *config.CGRConfig) (dialect gorm.Dialector, err error) {
var u *url.URL
// var err error
if u, err = url.Parse(strings.TrimPrefix(cgrCfg.EEsCfg().Exporters[sqlEe.cfgIdx].ExportPath, utils.Meta)); err != nil {

8
ees/sql_test.go
View File

@@ -75,7 +75,7 @@ func TestNewSQLeUrl(t *testing.T) {
}
sqlEe := &SQLEe{id: cgrCfg.EEsCfg().Exporters[0].ID,
cgrCfg: cgrCfg, cfgIdx: 0, filterS: filterS, dc: dc}
_, err = sqlEe.NewSQLEeUrl(cgrCfg)
_, err = sqlEe.NewSQLEeURL(cgrCfg)
errExpect := "db type <> not supported"
if err == nil || err.Error() != errExpect {
t.Errorf("Expected %v but received %v", errExpect, err)
@@ -101,7 +101,7 @@ func TestNewSQLeUrlSQL(t *testing.T) {
cgrCfg: cgrCfg, cfgIdx: 0, filterS: filterS, dc: dc}
dialectExpect := mysql.Open(fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8&loc=Local&parseTime=true&sql_mode='ALLOW_INVALID_DATES'",
"cgrates", "CGRateS.org", "127.0.0.1", "3306", "mysql"))
if dialect, err := sqlEe.NewSQLEeUrl(cgrCfg); err != nil {
if dialect, err := sqlEe.NewSQLEeURL(cgrCfg); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(dialect, dialectExpect) {
t.Errorf("Expected %v but received %v", utils.ToJSON(dialectExpect), utils.ToJSON(dialect))
@@ -127,7 +127,7 @@ func TestNewSQLeUrlPostgres(t *testing.T) {
cgrCfg: cgrCfg, cfgIdx: 0, filterS: filterS, dc: dc}
dialectExpect := postgres.Open(fmt.Sprintf("host=%s port=%s dbname=%s user=%s password=%s sslmode=%s",
"127.0.0.1", "3306", "postgres", "cgrates", "CGRateS.org", utils.SQLDefaultSSLMode))
if dialect, err := sqlEe.NewSQLEeUrl(cgrCfg); err != nil {
if dialect, err := sqlEe.NewSQLEeURL(cgrCfg); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(dialect, dialectExpect) {
t.Errorf("Expected %v but received %v", utils.ToJSON(dialectExpect), utils.ToJSON(dialect))
@@ -152,7 +152,7 @@ func TestNewSQLeExportPathError(t *testing.T) {
sqlEe := &SQLEe{id: cgrCfg.EEsCfg().Exporters[0].ID,
cgrCfg: cgrCfg, cfgIdx: 0, filterS: filterS, dc: dc}
errExpect := `parse ":foo": missing protocol scheme`
if _, err := sqlEe.NewSQLEeUrl(cgrCfg); err == nil || err.Error() != errExpect {
if _, err := sqlEe.NewSQLEeURL(cgrCfg); err == nil || err.Error() != errExpect {
t.Errorf("Expected %v but received %v", errExpect, err)
}
}

1
ees/virtualee.go
View File

@@ -56,7 +56,6 @@ func (vEe *VirtualEe) ID() string {
// OnEvicted implements EventExporter, doing the cleanup before exit
func (vEe *VirtualEe) OnEvicted(_ string, _ interface{}) {
return
}
// ExportEvent implements EventExporter

47
engine/lib_test.go Normal file
View File

@@ -0,0 +1,47 @@
/*
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
Copyright (C) ITsysCOM GmbH
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package engine
import (
"errors"
"flag"
"net/rpc"
"net/rpc/jsonrpc"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
var (
dataDir = flag.String("data_dir", "/usr/share/cgrates", "CGR data dir path here")
waitRater = flag.Int("wait_rater", 100, "Number of miliseconds to wait for rater to start and cache")
encoding = flag.String("rpc", utils.MetaJSON, "what encoding whould be uused for rpc comunication")
dbType = flag.String("dbtype", utils.MetaInternal, "The type of DataBase (Internal/Mongo/mySql)")
)
func newRPCClient(cfg *config.ListenCfg) (c *rpc.Client, err error) {
switch *encoding {
case utils.MetaJSON:
return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen)
case utils.MetaGOB:
return rpc.Dial(utils.TCP, cfg.RPCGOBListen)
default:
return nil, errors.New("UNSUPPORTED_RPC")
}
}