SpringCloud/spring-cloud-consul
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source
This commit is contained in:
spencergibb
2020-05-22 15:12:48 -04:00
parent 5832212414 e70cc1e82f
commit 21b5f90402
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -18,4 +18,4 @@ consul_*.zip
consul_*.zip.*
.vscode/
.flattened-pom.xml
.sdkmanrc

8
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
View File

@@ -23,6 +23,7 @@ import javax.validation.constraints.DecimalMax;
import javax.validation.constraints.DecimalMin;
import org.apache.commons.logging.Log;
import org.joda.time.Period;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.convert.DurationUnit;
@@ -52,9 +53,10 @@ public class HeartbeatProperties {
@DecimalMax("0.9")
private double intervalRatio = 2.0 / 3.0;
// TODO: did heartbeatInterval need to be a field?
protected Duration computeHearbeatInterval() {
/**
* @return the computed heartbeat interval
*/
protected Duration computeHeartbeatInterval() {
// heartbeat rate at ratio * ttl, but no later than ttl -1s and, (under lesser
// priority), no sooner than 1s from now
double interval = this.ttl.getSeconds() * this.intervalRatio;

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java
View File

@@ -64,7 +64,7 @@ public class TtlScheduler {
public void add(String instanceId) {
ScheduledFuture task = this.scheduler.scheduleAtFixedRate(
new ConsulHeartbeatTask(instanceId),
this.configuration.computeHearbeatInterval().toMillis());
this.configuration.computeHeartbeatInterval().toMillis());
ScheduledFuture previousTask = this.serviceHeartbeats.put(instanceId, task);
if (previousTask != null) {
previousTask.cancel(true);

4
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java
View File

@@ -31,7 +31,7 @@ public class HeartbeatPropertiesTests {
@Test
public void computeHeartbeatIntervalWorks() {
HeartbeatProperties properties = new HeartbeatProperties();
Duration period = properties.computeHearbeatInterval();
Duration period = properties.computeHeartbeatInterval();
assertThat(period).isNotNull();
assertThat(period.get(ChronoUnit.SECONDS)).isEqualTo(20);
@@ -41,7 +41,7 @@ public class HeartbeatPropertiesTests {
public void computeShortHeartbeat() {
HeartbeatProperties properties = new HeartbeatProperties();
properties.setTtl(Duration.ofSeconds(2));
Duration period = properties.computeHearbeatInterval();
Duration period = properties.computeHeartbeatInterval();
assertThat(period).isNotNull();
assertThat(period.get(ChronoUnit.SECONDS)).isEqualTo(1);