--- CircuitBreaker/src/dk/thoerup/curcuitbreaker/web/ViewCircuitBreaker.java	2009/10/08 07:07:14	417
+++ CircuitBreaker/src/dk/thoerup/circuitbreaker/web/ViewCircuitBreaker.java	2011/04/11 07:52:15	1285
@@ -1,13 +1,15 @@
-package dk.thoerup.curcuitbreaker.web;
+package dk.thoerup.circuitbreaker.web;
 
 import java.util.Date;
+import java.util.LinkedList;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import dk.thoerup.curcuitbreaker.AccountingCircuitBreaker;
-import dk.thoerup.curcuitbreaker.CircuitBreaker;
-import dk.thoerup.curcuitbreaker.CircuitBreakerManager;
+import dk.thoerup.circuitbreaker.AccountingCircuitBreaker;
+import dk.thoerup.circuitbreaker.LoggingCircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
 
 public class ViewCircuitBreaker implements Command {
 	
@@ -29,13 +31,13 @@
 		return sb.toString();
 	}
 	
-	public String getStateBar(String state) {
+	public String getStateBar(CircuitBreaker breaker) {
 		StringBuilder sb = new StringBuilder();
-		sb.append( state );
+		sb.append( breaker.getStateName() );
 		sb.append(": <span style=\"background-color: ");
-		if (state.equalsIgnoreCase("open")) {
+		if ( breaker.isOpen() ) {
 			sb.append("red");
-		} else if (state.equalsIgnoreCase("closed")) {
+		} else if ( breaker.isClosed() ) {
 			sb.append("green");
 		} else {
 			sb.append("yellow");
@@ -45,6 +47,14 @@
 		return sb.toString();
 	}
 	
+	public String formatDate(long date) {
+		if (date == 0L) {
+			return "-";
+		} else {
+			return new Date(date).toString();
+		}
+	}
+	
 	public String execute(HttpServletRequest req, HttpServletResponse resp) {
 		CircuitBreaker breaker = CircuitBreakerManager.getManager().getCircuitBreaker( req.getParameter("breaker"));
 		String uri = req.getRequestURI();
@@ -62,7 +72,7 @@
 		sb.append("<b>Attributes:</b>\n");
 		sb.append("<table border=\"1\" cellspacing=0>");		
 		sb.append("<tr><td>Name </td><td>").append(breaker.getName()).append("</td></tr>\n");
-		sb.append("<tr><td>State </td><td><b>").append(  getStateBar(breaker.getStateName())   ).append("</b></td></tr>\n");
+		sb.append("<tr><td>State </td><td><b>").append(  getStateBar(breaker) ).append("</b></td></tr>\n");
 		sb.append("<tr><td>Type </td><td>").append(breaker.getClass().getSimpleName() ).append("</td></tr>\n");
 		sb.append("<tr><td>Notifier </td><td>").append(breaker.getNotifierName()).append("</td></tr>\n");
 		sb.append("<tr><td>Failure count </td><td>").append(breaker.getFailureCount()).append("</td></tr>\n");
@@ -74,13 +84,33 @@
 			AccountingCircuitBreaker acb = (AccountingCircuitBreaker) breaker;
 			sb.append("<tr><th colspan=\"2\">Accounting</th></tr>\n");
 			sb.append("<tr><td>Trip count</td><td>").append( acb.getTripCount() ).append("</td></tr>\n");
+			sb.append("<tr><td>Re-trip count</td><td>").append( acb.getRetripCount() ).append("</td></tr>\n");
 			sb.append("<tr><td>Block count</td><td>").append( acb.getBlockCount() ).append("</td></tr>\n");
 			sb.append("<tr><td>Total failure count</td><td>").append( acb.getTotalFailureCount() ).append("</td></tr>\n");
 			sb.append("<tr><td>Total Call count</td><td>").append( acb.getTotalCallCount() ).append("</td></tr>\n");
-			sb.append("<tr><td>Last reset</td><td>").append( new Date(acb.getLastResetCounters()).toString() ).append("</td></tr>\n");			
+			sb.append("<tr><td>Last failure</td><td>").append( formatDate(acb.getLastFailure()) ).append("</td></tr>\n");
+			sb.append("<tr><td>Last trip</td><td>").append( formatDate(acb.getLastTrip()) ).append("</td></tr>\n");
+			sb.append("<tr><td>Last re-trip</td><td>").append( formatDate(acb.getLastRetrip()) ).append("</td></tr>\n");
+			sb.append("<tr><td>Last reset</td><td>").append( formatDate(acb.getLastReset()) ).append("</td></tr>\n");
+			
+			sb.append("<tr><td>Last resetCounters</td><td>").append( formatDate(acb.getLastResetCounters()) ).append("</td></tr>\n");			
+		}
+
+		if (breaker instanceof LoggingCircuitBreaker) {
+			LoggingCircuitBreaker lcb = (LoggingCircuitBreaker) breaker;			
+			
+			LinkedList<LoggingCircuitBreaker.LogEntry> list = lcb.getLog();
+
+			sb.append("<tr><th colspan=\"2\">Logging</th></tr>\n");
+			for(LoggingCircuitBreaker.LogEntry entry : list) {
+				sb.append("<tr><td>");
+				sb.append( formatDate(entry.time) ).append(" : ").append(entry.event);				
+				sb.append("</td></tr>");
+			}
 		}
 		
-		sb.append("</table><br>\n");
+		sb.append("</table>\n");
+		sb.append("Current time: ").append( new Date().toString() ).append("<br><br>\n");
 		
 		sb.append("<b>Operations:</b>\n");
 		if ( !readOnly ) {