Merge pull request #45 from nacos-group/develop

Develop
nacos-group · Apr 12, 2020 · 20301ac · 20301ac
2 parents 0b72330 + 3dc1d05
commit 20301ac
Show file tree

Hide file tree

Showing 298 changed files with 326 additions and 41,527 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.idea
+.data
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
diff --git a/clients/client_factory.go b/clients/client_factory.go
@@ -50,7 +50,7 @@ func setConfig(properties map[string]interface{}) (iClient nacos_client.INacosCl
 		if clientConfig, ok := clientConfigTmp.(constant.ClientConfig); ok {
 			err = client.SetClientConfig(clientConfig)
 			if err != nil {
-				return
+				return nil, err
 			}
 		}
 	} else {
@@ -65,7 +65,7 @@ func setConfig(properties map[string]interface{}) (iClient nacos_client.INacosCl
 		if serverConfigs, ok := serverConfigTmp.([]constant.ServerConfig); ok {
 			err = client.SetServerConfig(serverConfigs)
 			if err != nil {
-				return
+				return nil, err
 			}
 		}
 	} else {

diff --git a/clients/config_client/config_client_test.go b/clients/config_client/config_client_test.go
@@ -144,7 +144,7 @@ func Test_GetConfigWithErrorResponse_401(t *testing.T) {
 		gomock.AssignableToTypeOf(http.Header{}),
 		gomock.Eq(clientConfigTest.TimeoutMs),
 		gomock.Eq(configParamMapTest),
-	).Times(3).Return(http_agent.FakeHttpResponse(401, "no auth"), nil)
+	).Times(3).Return(http_agent.FakeHttpResponse(401, "no security"), nil)
 	result, err := client.GetConfig(configParamTest)
 	assert.Nil(t, err)
 	fmt.Printf("result:%s \n", result)
@@ -206,7 +206,7 @@ func Test_GetConfigWithCache(t *testing.T) {
 		gomock.AssignableToTypeOf(http.Header{}),
 		gomock.Eq(clientConfigTest.TimeoutMs),
 		gomock.Eq(configParamMapTest),
-	).Times(3).Return(http_agent.FakeHttpResponse(401, "no auth"), nil)
+	).Times(3).Return(http_agent.FakeHttpResponse(401, "no security"), nil)
 	content, err = client.GetConfig(configParamTest)
 	assert.Nil(t, err)
 	assert.Equal(t, "content", content)
@@ -268,7 +268,7 @@ func Test_PublishConfigWithErrorResponse(t *testing.T) {
 		gomock.AssignableToTypeOf(http.Header{}),
 		gomock.Eq(clientConfigTest.TimeoutMs),
 		gomock.Eq(localConfigMapTest),
-	).Times(3).Return(http_agent.FakeHttpResponse(401, "no auth"), nil)
+	).Times(3).Return(http_agent.FakeHttpResponse(401, "no security"), nil)
 	success, err := client.PublishConfig(localConfigTest)
 	assert.NotNil(t, err)
 	assert.True(t, !success)
@@ -343,7 +343,7 @@ func Test_DeleteConfigWithErrorResponse_401(t *testing.T) {
 		gomock.AssignableToTypeOf(http.Header{}),
 		gomock.Eq(clientConfigTest.TimeoutMs),
 		gomock.Eq(configParamMapTest),
-	).Times(3).Return(http_agent.FakeHttpResponse(401, "no auth"), nil)
+	).Times(3).Return(http_agent.FakeHttpResponse(401, "no security"), nil)
 	success, err := client.DeleteConfig(configParamTest)
 	assert.NotNil(t, err)
 	assert.Equal(t, false, success)
@@ -581,7 +581,7 @@ func Test_listenWithErrorResponse_401(t *testing.T) {
 		gomock.AssignableToTypeOf(headerTest),
 		gomock.Eq(clientConfigTest.TimeoutMs),
 		gomock.Eq(param),
-	).Times(1).Return(http_agent.FakeHttpResponse(401, "no auth"), nil)
+	).Times(1).Return(http_agent.FakeHttpResponse(401, "no security"), nil)
 
 	_ = client.SetHttpAgent(mockHttpAgent)
 

diff --git a/clients/config_client/config_proxy.go b/clients/config_client/config_proxy.go
@@ -18,7 +18,7 @@ type ConfigProxy struct {
 func NewConfigProxy(serverConfig []constant.ServerConfig, clientConfig constant.ClientConfig, httpAgent http_agent.IHttpAgent) (ConfigProxy, error) {
 	proxy := ConfigProxy{}
 	var err error
-	proxy.nacosServer, err = nacos_server.NewNacosServer(serverConfig, httpAgent, clientConfig.TimeoutMs, clientConfig.Endpoint)
+	proxy.nacosServer, err = nacos_server.NewNacosServer(serverConfig, clientConfig, httpAgent, clientConfig.TimeoutMs, clientConfig.Endpoint)
 	return proxy, err
 
 }

diff --git a/clients/naming_client/host_reator.go b/clients/naming_client/host_reator.go
@@ -5,7 +5,6 @@ import (
 	"github.com/nacos-group/nacos-sdk-go/clients/cache"
 	"github.com/nacos-group/nacos-sdk-go/model"
 	"github.com/nacos-group/nacos-sdk-go/utils"
-	nsema "github.com/toolkits/concurrent/semaphore"
 	"log"
 	"reflect"
 	"time"
@@ -131,7 +130,7 @@ func (hr *HostReactor) updateServiceNow(serviceName string, clusters string) {
 }
 
 func (hr *HostReactor) asyncUpdateService() {
-	sema := nsema.NewSemaphore(hr.updateThreadNum)
+	sema := utils.NewSemaphore(hr.updateThreadNum)
 	for {
 		for _, v := range hr.serviceInfoMap.Items() {
 			service := v.(model.Service)