--- CircuitBreaker/src/dk/thoerup/circuitbreaker/web/ViewCircuitBreaker.java 2011/04/11 07:58:57 1287 +++ CircuitBreaker/src/dk/thoerup/circuitbreaker/web/ViewCircuitBreaker.java 2011/04/16 11:11:07 1293 @@ -47,7 +47,7 @@ return sb.toString(); } - public String formatDate(long date) { + public static String formatDate(long date) { if (date == 0L) { return "-"; } else { @@ -100,11 +100,15 @@ LoggingCircuitBreaker lcb = (LoggingCircuitBreaker) breaker; LinkedList list = lcb.getLog(); + String headerLink = String.format("Logging", req.getRequestURI(), breaker.getName() ); - sb.append("Logging\n"); - for(LoggingCircuitBreaker.LogEntry entry : list) { + sb.append("").append(headerLink).append("\n"); + + int max = list.size() > 10 ? 10 : list.size(); + for (int i=0; i"); - sb.append( formatDate(entry.time) ).append(" : ").append(entry.event); + sb.append( entry.toString() ); sb.append(""); } } @@ -119,6 +123,9 @@ if (breaker instanceof AccountingCircuitBreaker ) { sb.append( actionBuilder(uri, "resetCounters", breaker.getName())).append("
\n"); } + if (breaker instanceof LoggingCircuitBreaker ) { + sb.append( actionBuilder(uri, "clearLog", breaker.getName())).append("
\n"); + } } else { sb.append("the CircuitBreakers can only be viewed"); }