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

upgrade hystrix to 1.4.4 and integrate dashboard changes

Browse Source 
fixes gh-300
This commit is contained in:
Spencer Gibb
2015-04-14 08:58:18 -06:00
parent 20da63c238
commit a765839771
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -25,7 +25,7 @@
<archaius.version>0.6.5</archaius.version>
<eureka.version>1.1.147</eureka.version>
<feign.version>8.1.0</feign.version>
<hystrix.version>1.4.1</hystrix.version>
<hystrix.version>1.4.4</hystrix.version>
<ribbon.version>2.0.0</ribbon.version>
<zuul.version>1.0.28</zuul.version>
<netflix.rxjava.version>0.20.7</netflix.rxjava.version>

2
spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java
View File

@@ -251,7 +251,7 @@ public class HystrixDashboardConfiguration {
&& CONNECTION_CLOSE_VALUE.equalsIgnoreCase(header.getValue())) {
log.warn("Ignoring 'Connection: close' header from stream response");
}
else {
else if (!HttpHeaders.TRANSFER_ENCODING.equalsIgnoreCase(header.getName())) {
response.addHeader(header.getName(), header.getValue());
}
}

3
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/templates/hystrixCircuit.html
View File

@@ -9,6 +9,9 @@
<a href="javascript://" title="Timed-out Request Count" class="line tooltip timeout"><%= addCommas(rollingCountTimeout) %></a>
<a href="javascript://" title="Threadpool Rejected Request Count" class="line tooltip rejected"><%= addCommas(rollingCountThreadPoolRejected) %></a>
<% } %>
<% if(propertyValue_executionIsolationStrategy == 'SEMAPHORE') { %>
<a href="javascript://" title="Semaphore Rejected Request Count" class="line tooltip rejected"><%= addCommas(rollingCountSemaphoreRejected) %></a>
<% } %>
<a href="javascript://" title="Failure Request Count" class="line tooltip failure"><%= addCommas(rollingCountFailure) %></a>
</div>
<div class="cell borderRight">

4
spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl
View File

@@ -131,6 +131,8 @@
// }, false);
source.addEventListener('error', function(e) {
$("#dependencies .loading").html("Unable to connect to Command Metric Stream.");
$("#dependencies .loading").addClass("failed");
if (e.eventPhase == EventSource.CLOSED) {
// Connection was closed.
console.log("Connection was closed on error: " + JSON.stringify(e));
@@ -166,6 +168,8 @@
// }, false);
source.addEventListener('error', function(e) {
$("#dependencies .loading").html("Unable to connect to Command Metric Stream.");
$("#dependencies .loading").addClass("failed");
if (e.eventPhase == EventSource.CLOSED) {
// Connection was closed.
console.log("Connection was closed on error: " + e);