diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 633e59b7c..902e82cf1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -40,7 +40,6 @@ jobs: run: gofmt -s -w . && git diff --exit-code - name: Go Vet - continue-on-error: true # option will soon be removed run: go vet ./... - name: Go Tidy diff --git a/agents/librad.go b/agents/librad.go index bcc941194..d3ec45754 100644 --- a/agents/librad.go +++ b/agents/librad.go @@ -54,16 +54,6 @@ func radComposedFieldValue(pkt *radigo.Packet, outVal += out continue } - for _, avp := range pkt.AttributesWithName( - attrVendorFromPath(rsrTpl.Rules)) { - if parsed, err := rsrTpl.ParseValue(avp.GetStringValue()); err != nil { - utils.Logger.Warning( - fmt.Sprintf("<%s> %s", - utils.RadiusAgent, err.Error())) - } else { - outVal += parsed - } - } } return outVal } diff --git a/engine/caches_test.go b/engine/caches_test.go index b9d9f8c05..d665e0d2d 100644 --- a/engine/caches_test.go +++ b/engine/caches_test.go @@ -477,9 +477,9 @@ func TestCacheSV1ReloadCacheErrors(t *testing.T) { { name: "FlushAll", args: args{attrs: utils.AttrReloadCacheWithArgDispatcher{ - &utils.ArgDispatcher{}, - utils.TenantArg{}, - utils.AttrReloadCache{ + ArgDispatcher: &utils.ArgDispatcher{}, + TenantArg: utils.TenantArg{}, + AttrReloadCache: utils.AttrReloadCache{ FlushAll: true, }, }, reply: &str}, @@ -488,10 +488,10 @@ func TestCacheSV1ReloadCacheErrors(t *testing.T) { { name: "Reload destination error", args: args{attrs: utils.AttrReloadCacheWithArgDispatcher{ - &utils.ArgDispatcher{}, - utils.TenantArg{}, - utils.AttrReloadCache{ - utils.ArgsCache{ + ArgDispatcher: &utils.ArgDispatcher{}, + TenantArg: utils.TenantArg{}, + AttrReloadCache: utils.AttrReloadCache{ + ArgsCache: utils.ArgsCache{ DestinationIDs: slc, ReverseDestinationIDs: slc, RatingPlanIDs: slc, @@ -515,7 +515,7 @@ func TestCacheSV1ReloadCacheErrors(t *testing.T) { DispatcherHostIDs: slc, DispatcherRoutesIDs: slc, }, - false, + FlushAll: false, }, }, reply: &str}, err: "err", @@ -547,9 +547,9 @@ func TestCacheSV1LoadCache(t *testing.T) { } err := chS.V1LoadCache(utils.AttrReloadCacheWithArgDispatcher{ - &utils.ArgDispatcher{}, - utils.TenantArg{}, - utils.AttrReloadCache{ + ArgDispatcher: &utils.ArgDispatcher{}, + TenantArg: utils.TenantArg{}, + AttrReloadCache: utils.AttrReloadCache{ FlushAll: true, }, }, &str) @@ -571,9 +571,9 @@ func TestCacheSV1FlushCacheFlushAll(t *testing.T) { } err := chS.V1FlushCache(utils.AttrReloadCacheWithArgDispatcher{ - &utils.ArgDispatcher{}, - utils.TenantArg{}, - utils.AttrReloadCache{ + ArgDispatcher: &utils.ArgDispatcher{}, + TenantArg: utils.TenantArg{}, + AttrReloadCache: utils.AttrReloadCache{ FlushAll: true, }, }, &str) diff --git a/engine/safevent.go b/engine/safevent.go index eabb44613..130eee23e 100644 --- a/engine/safevent.go +++ b/engine/safevent.go @@ -119,7 +119,7 @@ func (se *SafEvent) GetString(fldName string) (out string, err error) { return } -func (se SafEvent) GetTInt64(fldName string) (out int64, err error) { +func (se *SafEvent) GetTInt64(fldName string) (out int64, err error) { se.RLock() out, err = se.Me.GetTInt64(fldName) se.RUnlock() diff --git a/migrator/storage_redis.go b/migrator/storage_redis.go index b70ab1d97..69fa3c4b4 100644 --- a/migrator/storage_redis.go +++ b/migrator/storage_redis.go @@ -566,8 +566,6 @@ func (v1rs *redisMigrator) remV1Alias(key string) (err error) { } } return - - return v1rs.rds.Cmd("DEL", key).Err } // User methods diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index 31495f752..6a96d2784 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -58,10 +58,11 @@ func NewScheduler(dm *engine.DataManager, cfg *config.CGRConfig, } func (s *Scheduler) updateActStats(act *engine.Action, isFailed bool) { - mux := s.aSMux + var mux *sync.RWMutex + mux = &s.aSMux statsMp := s.actSuccessStats if isFailed { - mux = s.aFMux + mux = &s.aFMux statsMp = s.actFailedStats } now := time.Now() diff --git a/utils/server.go b/utils/server.go index 28cb767e5..048e7956a 100644 --- a/utils/server.go +++ b/utils/server.go @@ -374,7 +374,7 @@ func (r *rpcRequest) Call() io.Reader { } func loadTLSConfig(serverCrt, serverKey, caCert string, serverPolicy int, - serverName string) (config tls.Config, err error) { + serverName string) (config *tls.Config, err error) { cert, err := tls.LoadX509KeyPair(serverCrt, serverKey) if err != nil { log.Fatalf("Error: %s when load server keys", err) @@ -401,7 +401,7 @@ func loadTLSConfig(serverCrt, serverKey, caCert string, serverPolicy int, } } - config = tls.Config{ + config = &tls.Config{ Certificates: []tls.Certificate{cert}, ClientAuth: tls.ClientAuthType(serverPolicy), ClientCAs: rootCAs, @@ -424,7 +424,7 @@ func (s *Server) ServeGOBTLS(addr, serverCrt, serverKey, caCert string, if err != nil { return } - listener, err := tls.Listen(TCP, addr, &config) + listener, err := tls.Listen(TCP, addr, config) if err != nil { log.Printf("Error: %s when listening", err) exitChan <- true @@ -467,7 +467,7 @@ func (s *Server) ServeJSONTLS(addr, serverCrt, serverKey, caCert string, if err != nil { return } - listener, err := tls.Listen(TCP, addr, &config) + listener, err := tls.Listen(TCP, addr, config) if err != nil { log.Printf("Error: %s when listening", err) exitChan <- true @@ -554,7 +554,7 @@ func (s *Server) ServeHTTPTLS(addr, serverCrt, serverKey, caCert string, serverP httpSrv := http.Server{ Addr: addr, Handler: s.httpsMux, - TLSConfig: &config, + TLSConfig: config, } Logger.Info(fmt.Sprintf(" start listening at <%s>", addr)) if err := httpSrv.ListenAndServeTLS(serverCrt, serverKey); err != nil {