Debug Linter Error

free5gc · Jan 26, 2024 · e9ba650 · e9ba650
1 parent f826954
commit e9ba650
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/internal/sbi/consumer/nf_discovery.go b/internal/sbi/consumer/nf_discovery.go
@@ -22,7 +22,8 @@ func SendSearchNFInstances(nrfUri string, targetNfType, requestNfType models.NfT
 	configuration.SetBasePath(nrfUri)
 	client := Nnrf_NFDiscovery.NewAPIClient(configuration)
 
-	result, rsp, rspErr := client.NFInstancesStoreApi.SearchNFInstances(ctx, targetNfType, requestNfType, &param)
+	result, rsp, rspErr := client.NFInstancesStoreApi.SearchNFInstances(ctx,
+		targetNfType, requestNfType, &param)
 
 	if rspErr != nil {
 		return nil, fmt.Errorf("NFInstancesStoreApi Response error: %+w", rspErr)

diff --git a/internal/sbi/consumer/nf_management.go b/internal/sbi/consumer/nf_management.go
@@ -1,7 +1,7 @@
 package consumer
 
 import (
-	"context"
+
 	"fmt"
 	"net/http"
 	"strings"

diff --git a/internal/sbi/producer/functions.go b/internal/sbi/producer/functions.go
@@ -1,7 +1,7 @@
 package producer
 
 import (
-	"context"
+
 	"crypto/hmac"
 	"crypto/sha256"
 	"encoding/base64"

diff --git a/internal/sbi/producer/ue_authentication.go b/internal/sbi/producer/ue_authentication.go
@@ -2,7 +2,7 @@ package producer
 
 import (
 	"bytes"
-	"context"
+
 	"crypto/sha256"
 	"encoding/base64"
 	"encoding/hex"

diff --git a/pkg/factory/config.go b/pkg/factory/config.go
@@ -153,8 +153,8 @@ func appendInvalid(err error) error {
 }
 
 func (c *Config) GetVersion() string {
-	c.RLock()
-	defer c.RUnlock()
+	c.RWMutex.RLock()
+	defer c.RWMutex.RUnlock()
 
 	if c.Info.Version != "" {
 		return c.Info.Version
@@ -163,8 +163,8 @@ func (c *Config) GetVersion() string {
 }
 
 func (c *Config) SetLogEnable(enable bool) {
-	c.Lock()
-	defer c.Unlock()
+	c.RWMutex.Lock()
+	defer c.RWMutex.Unlock()
 
 	if c.Logger == nil {
 		logger.CfgLog.Warnf("Logger should not be nil")
@@ -178,8 +178,8 @@ func (c *Config) SetLogEnable(enable bool) {
 }
 
 func (c *Config) SetLogLevel(level string) {
-	c.Lock()
-	defer c.Unlock()
+	c.RWMutex.Lock()
+	defer c.RWMutex.Unlock()
 
 	if c.Logger == nil {
 		logger.CfgLog.Warnf("Logger should not be nil")
@@ -192,8 +192,8 @@ func (c *Config) SetLogLevel(level string) {
 }
 
 func (c *Config) SetLogReportCaller(reportCaller bool) {
-	c.Lock()
-	defer c.Unlock()
+	c.RWMutex.Lock()
+	defer c.RWMutex.Unlock()
 
 	if c.Logger == nil {
 		logger.CfgLog.Warnf("Logger should not be nil")
@@ -207,8 +207,8 @@ func (c *Config) SetLogReportCaller(reportCaller bool) {
 }
 
 func (c *Config) GetLogEnable() bool {
-	c.RLock()
-	defer c.RUnlock()
+	c.RWMutex.RLock()
+	defer c.RWMutex.RUnlock()
 	if c.Logger == nil {
 		logger.CfgLog.Warnf("Logger should not be nil")
 		return false
@@ -217,8 +217,8 @@ func (c *Config) GetLogEnable() bool {
 }
 
 func (c *Config) GetLogLevel() string {
-	c.RLock()
-	defer c.RUnlock()
+	c.RWMutex.RLock()
+	defer c.RWMutex.RUnlock()
 	if c.Logger == nil {
 		logger.CfgLog.Warnf("Logger should not be nil")
 		return "info"
@@ -227,8 +227,8 @@ func (c *Config) GetLogLevel() string {
 }
 
 func (c *Config) GetLogReportCaller() bool {
-	c.RLock()
-	defer c.RUnlock()
+	c.RWMutex.RLock()
+	defer c.RWMutex.RUnlock()
 	if c.Logger == nil {
 		logger.CfgLog.Warnf("Logger should not be nil")
 		return false