Fix InitLogger just no work

nacos-group · Jun 6, 2024 · 5384128 · 5384128
1 parent 61ecaa8
commit 5384128
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/clients/config_client/config_client.go b/clients/config_client/config_client.go
@@ -46,6 +46,8 @@ const (
 	executorErrDelay  = 5 * time.Second
 )
 
+var onceInitLogger sync.Once
+
 type ConfigClient struct {
 	ctx    context.Context
 	cancel context.CancelFunc
@@ -153,7 +155,11 @@ func NewConfigClient(nc nacos_client.INacosClient) (*ConfigClient, error) {
 }
 
 func initLogger(clientConfig constant.ClientConfig) error {
-	return logger.InitLogger(logger.BuildLoggerConfig(clientConfig))
+	var err error
+	onceInitLogger.Do(func() {
+		err = logger.InitLogger(logger.BuildLoggerConfig(clientConfig))
+	})
+	return err
 }
 
 func (client *ConfigClient) GetConfig(param vo.ConfigParam) (content string, err error) {

diff --git a/clients/naming_client/naming_client.go b/clients/naming_client/naming_client.go
@@ -21,6 +21,7 @@ import (
 	"math"
 	"math/rand"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/pkg/errors"
@@ -35,6 +36,8 @@ import (
 	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 )
 
+var onceInitLogger sync.Once
+
 // NamingClient ...
 type NamingClient struct {
 	nacos_client.INacosClient
@@ -88,7 +91,11 @@ func NewNamingClient(nc nacos_client.INacosClient) (*NamingClient, error) {
 }
 
 func initLogger(clientConfig constant.ClientConfig) error {
-	return logger.InitLogger(logger.BuildLoggerConfig(clientConfig))
+	var err error
+	onceInitLogger.Do(func() {
+		err = logger.InitLogger(logger.BuildLoggerConfig(clientConfig))
+	})
+	return err
 }
 
 // RegisterInstance ...

diff --git a/common/logger/logger.go b/common/logger/logger.go
@@ -118,9 +118,6 @@ func BuildLoggerConfig(clientConfig constant.ClientConfig) Config {
 func InitLogger(config Config) (err error) {
 	logLock.Lock()
 	defer logLock.Unlock()
-	if logger != nil {
-		return
-	}
 	logger, err = InitNacosLogger(config)
 	return
 }