spring/spring-cloud-netflix
1
0
Fork 0
mirror of https://github.com/spring-cloud/spring-cloud-netflix.git synced 2026-09-17 15:49:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0.x' into 3.1.x

Browse Source
This commit is contained in:
Olga MaciaszekSharma
2022-01-11 15:06:43 +01:00
parent 39b4c8b578 927a51c21c
commit 91790a55a7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-cloud-netflix-eureka-server/src/main/java/org/springframework/cloud/netflix/eureka/server/EurekaController.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class EurekaController {
model.put("datacenter", "N/A"); // FIXME:
PeerAwareInstanceRegistry registry = getRegistry();
model.put("registry", registry);
model.put("isBelowRenewThresold", registry.isBelowRenewThresold() == 1);
model.put("isBelowRenewThreshold", registry.isBelowRenewThresold() == 1);
DataCenterInfo info = applicationInfoManager.getInfo().getDataCenterInfo();
if (info.getName() == DataCenterInfo.Name.Amazon) {
AmazonInfo amazonInfo = (AmazonInfo) info;
spring-cloud-netflix-eureka-server/src/main/resources/templates/eureka/navbar.ftlh
+1 -1
View File
@@ -52,7 +52,7 @@
</div>
</div>
<#if isBelowRenewThresold>
<#if isBelowRenewThreshold>
<#if !registry.selfPreservationModeEnabled>
<h4 id="uptime"><font size="+1" color="red"><b>RENEWALS ARE LESSER THAN THE THRESHOLD. THE SELF PRESERVATION MODE IS TURNED OFF. THIS MAY NOT PROTECT INSTANCE EXPIRY IN CASE OF NETWORK/OTHER PROBLEMS.</b></font></h4>
<#else>