Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
spring-cloud-netflix
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
openSource
spring-cloud-netflix
Commits
a7658397
Commit
a7658397
authored
Apr 14, 2015
by
Spencer Gibb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upgrade hystrix to 1.4.4 and integrate dashboard changes
fixes gh-300
parent
20da63c2
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
pom.xml
pom.xml
+1
-1
HystrixDashboardConfiguration.java
...flix/hystrix/dashboard/HystrixDashboardConfiguration.java
+1
-1
hystrixCircuit.html
...x/components/hystrixCommand/templates/hystrixCircuit.html
+3
-0
monitor.ftl
...ashboard/src/main/resources/templates/hystrix/monitor.ftl
+4
-0
No files found.
pom.xml
View file @
a7658397
...
...
@@ -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>
...
...
spring-cloud-netflix-hystrix-dashboard/src/main/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardConfiguration.java
View file @
a7658397
...
...
@@ -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
());
}
}
...
...
spring-cloud-netflix-hystrix-dashboard/src/main/resources/static/hystrix/components/hystrixCommand/templates/hystrixCircuit.html
View file @
a7658397
...
...
@@ -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"
>
...
...
spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl
View file @
a7658397
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment