Merge pull request #62 from benjchristensen/js-fixes

applying js fixes to threadPool ui
Netflix · Dec 21, 2012 · f5a4de2 · f5a4de2
2 parents c14b3a0 + 9e40cb1
commit f5a4de2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...ashboard/src/main/webapp/components/hystrixCommand/templates/hystrixCircuitContainer.html b/...ashboard/src/main/webapp/components/hystrixCommand/templates/hystrixCircuitContainer.html
@@ -1,9 +1,6 @@
 <div class="monitor" id="CIRCUIT_<%= name %>" style="position:relative;">
 	<%
 		var displayName = name;
-		if(displayName.substring(0, 36) == 'APIDependencyCommand_CircuitBreaker_') {
-			displayName = displayName.substring(36, displayName.length);
-		}
 		if(displayName.length > 32) {
 			displayName = displayName.substring(0,4) + "..." + displayName.substring(displayName.length-20, displayName.length);
 		}

diff --git a/hystrix-dashboard/src/main/webapp/components/hystrixThreadPool/hystrixThreadPool.js b/hystrix-dashboard/src/main/webapp/components/hystrixThreadPool/hystrixThreadPool.js
@@ -81,8 +81,10 @@
 		 * e.g   Get Averages from sums, do rate calculation etc. 
 		 */
 		function preProcessData(data) {
-
 			validateData(data);
+			// clean up the 'name' field so it doesn't have invalid characters
+			data.name = data.name.replace(/[.:-]/g,'_');
+			// do math
 			converAllAvg(data);
 		}
 

diff --git a/...rd/src/main/webapp/components/hystrixThreadPool/templates/hystrixThreadPoolContainer.html b/...rd/src/main/webapp/components/hystrixThreadPool/templates/hystrixThreadPoolContainer.html
@@ -1,6 +1,14 @@
 <div class="monitor" id="THREAD_POOL_<%= name %>" style="position:relative;">
+
+	<%
+		var displayName = name;
+		if(displayName.length > 32) {
+			displayName = displayName.substring(0,4) + "..." + displayName.substring(displayName.length-20, displayName.length);
+		}
+	%>
+
 	<div id="chart_THREAD_POOL_<%= name %>" class="chart" style="position:absolute;top:0px;left:0; float:left; width:100%; height:100%;"></div>
-	<div style="position:absolute;top:0x;width:100%;height:15px;opacity:0.8; background:white;"><p class="name"><%= name %></p></div>
+	<div style="position:absolute;top:0x;width:100%;height:15px;opacity:0.8; background:white;"><p class="name"><%= displayName %></p></div>
 	<div style="position:absolute;top:15px;; opacity:0.8; background:white; width:100%; height:95%;">
 		<div class="monitor_data"></div>
 	</div>