From bea88fb2c853797637840f4eab80c43e8234f53e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=97=E5=B0=91?= <314226532@qq.com> Date: Thu, 10 Jan 2019 13:26:02 +0800 Subject: [PATCH] add constant for MigrateRefreshEventListener and AnsServerList --- .../ans/migrate/MigrateRefreshEventListener.java | 5 ++++- .../cloud/alicloud/ans/ribbon/AnsServerList.java | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java index ed1505dc..4c15b4df 100644 --- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java +++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java @@ -19,6 +19,8 @@ import com.netflix.loadbalancer.ILoadBalancer; @Component public class MigrateRefreshEventListener implements ApplicationListener { + private final static int CHECK_INTERVAL = 1; + private final static String MIGRATE_SWITCH = "sca.migrate.ans.switch"; private volatile String lastScaMigrateAnsSwitchValue = "true"; @@ -36,7 +38,8 @@ public class MigrateRefreshEventListener implements ApplicationListener onApplicationEvent(null), 1, 1, TimeUnit.SECONDS); + () -> onApplicationEvent(null), CHECK_INTERVAL, CHECK_INTERVAL, + TimeUnit.SECONDS); } @Override diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java index d6a3d9df..74472369 100644 --- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java +++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java @@ -16,19 +16,21 @@ package org.springframework.cloud.alicloud.ans.ribbon; -import java.util.ArrayList; -import java.util.List; - import com.alibaba.ans.core.NamingService; import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host; import com.netflix.client.config.IClientConfig; import com.netflix.loadbalancer.AbstractServerList; +import java.util.ArrayList; +import java.util.List; + /** * @author xiaolongzuo */ public class AnsServerList extends AbstractServerList { + private final static int CONNECT_TIME_OUT = 3; + private String dom; public AnsServerList(String dom) { @@ -61,7 +63,7 @@ public class AnsServerList extends AbstractServerList { for (Host host : hosts) { if (host.isValid()) { AnsServer ansServer = hostToServer(host); - if (ansServer.isAlive(3)) { + if (ansServer.isAlive(CONNECT_TIME_OUT)) { result.add(ansServer); } }