Skip to content

S
spring-cloud-netflix
Commit 9fb833e4 by Dave Syer
Options

Fix paths in /hystrix HTML pages

When running from /hystrix or from / (with a forward) the webjars and the monitor endpoint need to be resolvable, so we need to use the FTL macros again. Fixes gh-193
parent 4c517913
Showing with 13 additions and 7 deletions
spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/index.ftl
<#import "/spring.ftl" as spring />
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html> <html>
<head> <head>
<base href="${basePath}"> <base href="<@spring.url basePath/>">
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
<title>Hystrix Dashboard</title> <title>Hystrix Dashboard</title>
<!-- Javascript to monitor and display --> <!-- Javascript to monitor and display -->
<script src="webjars/jquery/2.1.1/jquery.min.js" type="text/javascript"></script> <script src="<@spring.url '/webjars/jquery/2.1.1/jquery.min.js'/>" type="text/javascript"></script>
<script> <script>
function sendToMonitor() { function sendToMonitor() {
if($('#stream').val().length > 0) { if($('#stream').val().length > 0) {
var url = "hystrix/monitor?stream=" + encodeURIComponent($('#stream').val()) + ""; var url = "<@spring.url '/hystrix'/>/monitor?stream=" + encodeURIComponent($('#stream').val()) + "";
if($('#delay').val().length > 0) { if($('#delay').val().length > 0) {
url += "&delay=" + $('#delay').val(); url += "&delay=" + $('#delay').val();
} }
......
spring-cloud-netflix-hystrix-dashboard/src/main/resources/templates/hystrix/monitor.ftl
<#import "/spring.ftl" as spring />
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<base href="${basePath}"> <base href="<@spring.url basePath/>">
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Hystrix Monitor</title> <title>Hystrix Monitor</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
...@@ -13,10 +14,10 @@ ...@@ -13,10 +14,10 @@
<link rel="stylesheet" type="text/css" href="css/monitor.css" /> <link rel="stylesheet" type="text/css" href="css/monitor.css" />
<!-- d3 --> <!-- d3 -->
<script type="text/javascript" src="../webjars/d3js/3.4.11/d3.min.js" ></script> <script type="text/javascript" src="<@spring.url '/webjars/d3js/3.4.11/d3.min.js'/>" ></script>
<!-- Javascript to monitor and display --> <!-- Javascript to monitor and display -->
<script type="text/javascript" src="../webjars/jquery/2.1.1/jquery.min.js" ></script> <script type="text/javascript" src="<@spring.url '/webjars/jquery/2.1.1/jquery.min.js'/>" ></script>
<script type="text/javascript" src="js/jquery.tinysort.min.js"></script> <script type="text/javascript" src="js/jquery.tinysort.min.js"></script>
<script type="text/javascript" src="js/tmpl.js"></script> <script type="text/javascript" src="js/tmpl.js"></script>
......
spring-cloud-netflix-hystrix-dashboard/src/test/java/org/springframework/cloud/netflix/hystrix/dashboard/HystrixDashboardTests.java
...@@ -32,6 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; ...@@ -32,6 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.context.web.WebAppConfiguration;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/** /**
* @author Dave Syer * @author Dave Syer
...@@ -50,7 +51,10 @@ public class HystrixDashboardTests { ...@@ -50,7 +51,10 @@ public class HystrixDashboardTests {
ResponseEntity<String> entity = new TestRestTemplate().getForEntity( ResponseEntity<String> entity = new TestRestTemplate().getForEntity(
"http://localhost:" + this.port + "/hystrix", String.class); "http://localhost:" + this.port + "/hystrix", String.class);
assertEquals(HttpStatus.OK, entity.getStatusCode()); assertEquals(HttpStatus.OK, entity.getStatusCode());
entity.getBody().contains("<base href=\"/\">"); String body = entity.getBody();
assertTrue(body.contains("<base href=\"/hystrix\">"));
assertTrue(body.contains("\"/webjars"));
assertTrue(body.contains("= \"/hystrix/monitor"));
} }
@Test @Test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment