update case

zouyx · Dec 9, 2020 · 68a4c3a · 68a4c3a
1 parent df3d07e
commit 68a4c3a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/cluster/roundrobin/round_robin_test.go b/cluster/roundrobin/round_robin_test.go
@@ -100,9 +100,9 @@ func TestSelectHost(t *testing.T) {
 
 	//check servers
 	server.SetNextTryConnTime(appConfig.GetHost(), 5)
-	firstHost := balanace.Load(server.GetServers(appConfig.GetHost()))
-	Assert(t, host, NotEqual(firstHost.HomepageURL))
-	server.SetDownNode(appConfig.GetHost(), firstHost.HomepageURL)
+	firstHost := balanace.Load(server.GetServers(appConfig.GetHost())).HomepageURL
+	Assert(t, host, NotEqual(firstHost))
+	server.SetDownNode(appConfig.GetHost(), firstHost)
 
 	secondHost := balanace.Load(server.GetServers(appConfig.GetHost())).HomepageURL
 	Assert(t, host, NotEqual(secondHost))

diff --git a/component/serverlist/sync_test.go b/component/serverlist/sync_test.go
@@ -62,10 +62,11 @@ func getTestAppConfig() *config.AppConfig {
 
 func TestSyncServerIpListSuccessCallBack(t *testing.T) {
 	appConfig := getTestAppConfig()
-	SyncServerIPListSuccessCallBack([]byte(servicesConfigResponseStr), http.CallBack{AppConfigFunc: func() config.AppConfig {
+	serverMap, _ := SyncServerIPListSuccessCallBack([]byte(servicesConfigResponseStr), http.CallBack{AppConfigFunc: func() config.AppConfig {
 		return *appConfig
 	}})
-	Assert(t, server.GetServersLen(appConfig.GetHost()), Equal(10))
+	m := serverMap.(map[string]*config.ServerInfo)
+	Assert(t, len(m), Equal(10))
 }
 
 func TestSetDownNode(t *testing.T) {

diff --git a/env/server/server.go b/env/server/server.go
@@ -72,11 +72,11 @@ func SetServers(configIp string, serverMap map[string]*config.ServerInfo) {
 }
 
 //SetDownNode 设置失效节点
-func SetDownNode(host string, configIp string) {
+func SetDownNode(configIp string, host string) {
 	serverLock.Lock()
 	defer serverLock.Unlock()
 	s := ipMap[configIp]
-	if host == "" || s == nil {
+	if host == "" || s == nil || len(s.serverMap) == 0 {
 		return
 	}
 
@@ -93,14 +93,14 @@ func SetDownNode(host string, configIp string) {
 }
 
 //IsConnectDirectly is connect by ip directly
-//false : no
-//true : yes
+//false : yes
+//true : no
 func IsConnectDirectly(configIp string) bool {
 	serverLock.Lock()
 	defer serverLock.Unlock()
 	s := ipMap[configIp]
-	if s == nil {
-		return true
+	if s == nil || len(s.serverMap) == 0 {
+		return false
 	}
 	if s.nextTryConnTime >= 0 && s.nextTryConnTime > time.Now().Unix() {
 		return true

diff --git a/env/server/server_test.go b/env/server/server_test.go
@@ -51,5 +51,5 @@ func TestAppConfig_IsConnectDirectly(t *testing.T) {
 
 	SetNextTryConnTime(name, 10)
 	isConnectDirectly = IsConnectDirectly(name)
-	Assert(t, isConnectDirectly, Equal(true))
+	Assert(t, isConnectDirectly, Equal(false))
 }
diff --git a/protocol/http/request.go b/protocol/http/request.go
@@ -183,6 +183,10 @@ func RequestRecovery(appConfig config.AppConfig,
 		requestURL := fmt.Sprintf(format, host, connectConfig.URI)
 		response, err = Request(requestURL, connectConfig, callBack)
 		if err == nil {
+			return response, nil
+		}
+
+		if host == appConfig.GetHost() {
 			return response, err
 		}