Merge pull request #162 from nacos-group/debug-prom

fix: get empty server list from endpoint
nacos-group · Dec 8, 2020 · fab32c8 · fab32c8
2 parents 762827f + 5a038dd
commit fab32c8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/clients/config_client/config_proxy.go b/clients/config_client/config_proxy.go
@@ -33,7 +33,7 @@ import (
 )
 
 type ConfigProxy struct {
-	nacosServer  nacos_server.NacosServer
+	nacosServer  *nacos_server.NacosServer
 	clientConfig constant.ClientConfig
 }
 

diff --git a/clients/naming_client/beat_reactor_test.go b/clients/naming_client/beat_reactor_test.go
@@ -19,13 +19,15 @@ package naming_client
 import (
 	"testing"
 
+	"github.com/nacos-group/nacos-sdk-go/common/nacos_server"
+
 	"github.com/nacos-group/nacos-sdk-go/model"
 	"github.com/nacos-group/nacos-sdk-go/util"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestBeatReactor_AddBeatInfo(t *testing.T) {
-	br := NewBeatReactor(NamingProxy{}, 5000)
+	br := NewBeatReactor(NamingProxy{nacosServer: &nacos_server.NacosServer{}}, 5000)
 	serviceName := "Test"
 	groupName := "public"
 	beatInfo := model.BeatInfo{
@@ -44,7 +46,7 @@ func TestBeatReactor_AddBeatInfo(t *testing.T) {
 }
 
 func TestBeatReactor_RemoveBeatInfo(t *testing.T) {
-	br := NewBeatReactor(NamingProxy{}, 5000)
+	br := NewBeatReactor(NamingProxy{nacosServer: &nacos_server.NacosServer{}}, 5000)
 	serviceName := "Test"
 	groupName := "public"
 	beatInfo1 := model.BeatInfo{

diff --git a/clients/naming_client/naming_proxy.go b/clients/naming_client/naming_proxy.go
@@ -33,7 +33,7 @@ import (
 
 type NamingProxy struct {
 	clientConfig constant.ClientConfig
-	nacosServer  nacos_server.NacosServer
+	nacosServer  *nacos_server.NacosServer
 }
 
 func NewNamingProxy(clientCfg constant.ClientConfig, serverCfgs []constant.ServerConfig, httpAgent http_agent.IHttpAgent) (NamingProxy, error) {

diff --git a/common/nacos_server/nacos_server.go b/common/nacos_server/nacos_server.go
@@ -51,9 +51,9 @@ type NacosServer struct {
 	vipSrvRefInterMills int64
 }
 
-func NewNacosServer(serverList []constant.ServerConfig, clientCfg constant.ClientConfig, httpAgent http_agent.IHttpAgent, timeoutMs uint64, endpoint string) (NacosServer, error) {
+func NewNacosServer(serverList []constant.ServerConfig, clientCfg constant.ClientConfig, httpAgent http_agent.IHttpAgent, timeoutMs uint64, endpoint string) (*NacosServer, error) {
 	if len(serverList) == 0 && endpoint == "" {
-		return NacosServer{}, errors.New("both serverlist  and  endpoint are empty")
+		return &NacosServer{}, errors.New("both serverlist  and  endpoint are empty")
 	}
 
 	securityLogin := security.NewAuthClient(clientCfg, serverList, httpAgent)
@@ -70,11 +70,11 @@ func NewNacosServer(serverList []constant.ServerConfig, clientCfg constant.Clien
 	_, err := securityLogin.Login()
 
 	if err != nil {
-		return ns, err
+		return &ns, err
 	}
 
 	securityLogin.AutoRefresh()
-	return ns, nil
+	return &ns, nil
 }
 
 func (server *NacosServer) callConfigServer(api string, params map[string]string, newHeaders map[string]string,
@@ -246,8 +246,10 @@ func (server *NacosServer) initRefreshSrvIfNeed() {
 	}
 	server.refreshServerSrvIfNeed()
 	go func() {
-		time.Sleep(time.Duration(1) * time.Second)
-		server.refreshServerSrvIfNeed()
+		for {
+			time.Sleep(time.Duration(1) * time.Second)
+			server.refreshServerSrvIfNeed()
+		}
 	}()
 
 }
@@ -289,7 +291,6 @@ func (server *NacosServer) refreshServerSrvIfNeed() {
 		}
 
 	}
-
 	return
 }