From 3298ea1adfb299226bd1121b24cfc53dd04ab6de Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Thu, 26 Sep 2019 18:55:55 +0800 Subject: [PATCH 1/3] add sidecar health check interval configuration item. --- .../alibaba/cloud/sidecar/SidecarHealthChecker.java | 2 +- .../alibaba/cloud/sidecar/SidecarProperties.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java index 66deeb6e1..2976e8757 100644 --- a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java +++ b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarHealthChecker.java @@ -71,7 +71,7 @@ public class SidecarHealthChecker { this.sidecarDiscoveryClient.deregisterInstance(applicationName, ip, port); } - }, 0, 30, TimeUnit.SECONDS); + }, 0, sidecarProperties.getHealthCheckInterval(), TimeUnit.MILLISECONDS); } } diff --git a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java index 50f91692c..06b398412 100644 --- a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java +++ b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java @@ -51,6 +51,11 @@ public class SidecarProperties { */ private URI healthCheckUrl; + /** + * interval of health check. + */ + private long healthCheckInterval =30000L; + public String getIp() { return ip; } @@ -75,4 +80,12 @@ public class SidecarProperties { this.healthCheckUrl = healthCheckUrl; } + public long getHealthCheckInterval() { + return healthCheckInterval; + } + + public void setHealthCheckInterval(long healthCheckInterval) { + this.healthCheckInterval = healthCheckInterval; + } + } From 9441194da4bcc10299f6922915c49d16b895dd30 Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Thu, 26 Sep 2019 19:13:53 +0800 Subject: [PATCH 2/3] format code --- spring-cloud-alibaba-sidecar/pom.xml | 2 +- .../java/com/alibaba/cloud/sidecar/SidecarProperties.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-alibaba-sidecar/pom.xml b/spring-cloud-alibaba-sidecar/pom.xml index ea5595e9f..4feac69ad 100644 --- a/spring-cloud-alibaba-sidecar/pom.xml +++ b/spring-cloud-alibaba-sidecar/pom.xml @@ -9,7 +9,7 @@ 4.0.0 spring-cloud-alibaba-sidecar - spring-cloud-alibaba-sidecar + Spring Cloud Alibaba Sidecar An easy way to integrate polyglot apps for Spring Cloud Alibaba. diff --git a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java index 06b398412..f02931a1b 100644 --- a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java +++ b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java @@ -52,9 +52,9 @@ public class SidecarProperties { private URI healthCheckUrl; /** - * interval of health check. + * interval of health check */ - private long healthCheckInterval =30000L; + private long healthCheckInterval = 30000L; public String getIp() { return ip; From 33148731ff90023b087333778c6b8d2be776a88d Mon Sep 17 00:00:00 2001 From: fangjian0423 Date: Fri, 27 Sep 2019 00:46:08 +0800 Subject: [PATCH 3/3] format code match maven check plugin --- .../main/java/com/alibaba/cloud/sidecar/SidecarProperties.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java index f02931a1b..b95f91897 100644 --- a/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java +++ b/spring-cloud-alibaba-sidecar/src/main/java/com/alibaba/cloud/sidecar/SidecarProperties.java @@ -52,7 +52,7 @@ public class SidecarProperties { private URI healthCheckUrl; /** - * interval of health check + * interval of health check. */ private long healthCheckInterval = 30000L;