Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect default values in docs (#4294) #4344

Merged
merged 1 commit into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -41,6 +41,7 @@
*
* @author Dave Syer
* @author Gregor Zurowski
* @author Mooyong Lee
*/
@ConfigurationProperties(EurekaClientConfigBean.PREFIX)
public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
Expand All @@ -60,8 +61,6 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
*/
public static final String DEFAULT_ZONE = "defaultZone";

private static final int MINUTES = 60;

@Autowired(required = false)
PropertyResolver propertyResolver;

Expand Down Expand Up @@ -96,7 +95,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
* Eureka servers could be added or removed and this setting controls how soon the
* eureka clients should know about it.
*/
private int eurekaServiceUrlPollIntervalSeconds = 5 * MINUTES;
private int eurekaServiceUrlPollIntervalSeconds = 300; // 5 * MINUTES

/**
* Gets the proxy port to eureka server if any.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -30,6 +30,7 @@
* {@link RestTemplateEurekaHttpClient}.
*
* @author Jiwon Jeon
* @author Mooyong Lee
* @since 3.1.6
*/
@ConfigurationProperties("eureka.client.rest-template-timeout")
Expand All @@ -39,11 +40,11 @@ public class RestTemplateTimeoutProperties {
* Default values are set to 180000, in keeping with {@link RequestConfig} and
* {@link SocketConfig} defaults.
*/
private int connectTimeout = 3 * 60 * 1000;
private int connectTimeout = 180000; // 3 * MINUTES

private int connectRequestTimeout = 3 * 60 * 1000;
private int connectRequestTimeout = 180000; // 3 * MINUTES

private int socketTimeout = 3 * 60 * 1000;
private int socketTimeout = 180000; // 3 * MINUTES

public int getConnectTimeout() {
return connectTimeout;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2013-2022 the original author or authors.
* Copyright 2013-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,6 +34,7 @@
/**
* @author Dave Syer
* @author Gregor Zurowski
* @author Mooyong Lee
*/
@ConfigurationProperties(EurekaServerConfigBean.PREFIX)
public class EurekaServerConfigBean implements EurekaServerConfig {
Expand All @@ -43,8 +44,6 @@ public class EurekaServerConfigBean implements EurekaServerConfig {
*/
public static final String PREFIX = "eureka.server";

private static final int MINUTES = 60 * 1000;

@Autowired(required = false)
PropertyResolver propertyResolver;

Expand All @@ -54,23 +53,23 @@ public class EurekaServerConfigBean implements EurekaServerConfig {

private int eIPBindRebindRetries = 3;

private int eIPBindingRetryIntervalMs = 5 * MINUTES;
private int eIPBindingRetryIntervalMs = 300000; // 5 * MINUTES

private int eIPBindingRetryIntervalMsWhenUnbound = 1 * MINUTES;
private int eIPBindingRetryIntervalMsWhenUnbound = 60000; // 1 * MINUTES

private boolean enableSelfPreservation = true;

private double renewalPercentThreshold = 0.85;

private int renewalThresholdUpdateIntervalMs = 15 * MINUTES;
private int renewalThresholdUpdateIntervalMs = 900000; // 15 * MINUTES

private int peerEurekaNodesUpdateIntervalMs = 10 * MINUTES;
private int peerEurekaNodesUpdateIntervalMs = 600000; // 10 * MINUTES

private int numberOfReplicationRetries = 5;

private int peerEurekaStatusRefreshTimeIntervalMs = 30 * 1000;

private int waitTimeInMsWhenSyncEmpty = 5 * MINUTES;
private int waitTimeInMsWhenSyncEmpty = 300000; // 5 * MINUTES

private int peerNodeConnectTimeoutMs = 200;

Expand All @@ -82,23 +81,24 @@ public class EurekaServerConfigBean implements EurekaServerConfig {

private int peerNodeConnectionIdleTimeoutSeconds = 30;

private long retentionTimeInMSInDeltaQueue = 3 * MINUTES;
private long retentionTimeInMSInDeltaQueue = 180000; // 3 * MINUTES

private long deltaRetentionTimerIntervalInMs = 30 * 1000;
private long deltaRetentionTimerIntervalInMs = 30000; // 30 * SECONDS

private long evictionIntervalTimerInMs = 60 * 1000;

private int aSGQueryTimeoutMs = 300;

private long aSGUpdateIntervalMs = 5 * MINUTES;
private long aSGUpdateIntervalMs = 300000; // 5 * MINUTES

private long aSGCacheExpiryTimeoutMs = 10 * MINUTES; // defaults to longer than the
private long aSGCacheExpiryTimeoutMs = 600000; // 10 * MINUTES // defaults to longer
// than the

// asg update interval

private long responseCacheAutoExpirationInSeconds = 180;

private long responseCacheUpdateIntervalMs = 30 * 1000;
private long responseCacheUpdateIntervalMs = 30000; // 30 * SECONDS

private boolean useReadOnlyResponseCache = true;

Expand Down Expand Up @@ -186,7 +186,7 @@ public class EurekaServerConfigBean implements EurekaServerConfig {

private int route53BindRebindRetries = 3;

private int route53BindingRetryIntervalMs = 5 * MINUTES;
private int route53BindingRetryIntervalMs = 300000; // 5 * MINUTES

private long route53DomainTTL = 30;

Expand Down