--- android/TrainInfoService/src/dk/thoerup/traininfoservice/CircuitBreakerListener.java	2009/10/08 12:19:42	421
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/CircuitBreakerListener.java	2010/09/13 17:57:31	1042
@@ -4,17 +4,18 @@
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
+import javax.servlet.annotation.WebListener;
 
-import dk.thoerup.curcuitbreaker.AccountingCircuitBreaker;
-import dk.thoerup.curcuitbreaker.CircuitBreaker;
-import dk.thoerup.curcuitbreaker.CircuitBreakerManager;
-import dk.thoerup.curcuitbreaker.jmx.JMXWrapper;
-import dk.thoerup.curcuitbreaker.notification.JavaLogNotifier;
+import dk.thoerup.circuitbreaker.AccountingCircuitBreaker;
+import dk.thoerup.circuitbreaker.CircuitBreakerManager;
+import dk.thoerup.circuitbreaker.jmx.JMXWrapper;
+import dk.thoerup.circuitbreaker.notification.JavaLogNotifier;
 
 /**
  * Application Lifecycle Listener implementation class JmxListener
  *
  */
+@WebListener
 public class CircuitBreakerListener implements ServletContextListener {
 
 	Logger logger = Logger.getLogger(CircuitBreakerListener.class.getName());
@@ -28,11 +29,17 @@
     public void contextInitialized(ServletContextEvent sce) {
         logger.warning("Context Init");
         
+        int threshold = Integer.parseInt(sce.getServletContext().getInitParameter("banedk_threshold") );
+        int timeout = Integer.parseInt( sce.getServletContext().getInitParameter("banedk_timeout") );
         CircuitBreakerManager mgr = CircuitBreakerManager.getManager();
         
-		AccountingCircuitBreaker banedk = new AccountingCircuitBreaker("banedk", 5, 20000);
+		AccountingCircuitBreaker banedk = new AccountingCircuitBreaker("banedk", threshold, timeout);
 		banedk.setNotifier( new JavaLogNotifier() );
-		mgr.addCircuitBreaker( banedk );		
+		mgr.addCircuitBreaker( banedk );
+		
+		AccountingCircuitBreaker metro = new AccountingCircuitBreaker("metro", threshold, timeout);
+		metro.setNotifier( new JavaLogNotifier() );
+		mgr.addCircuitBreaker( metro );
 		
 		JMXWrapper.registerAllCircuitBreakers();
     }
@@ -42,6 +49,8 @@
      */
     public void contextDestroyed(ServletContextEvent sce) {
     	logger.warning("Context Destroyed");
+		CircuitBreakerManager.getManager().removeCircuitBreaker("banedk");
+
     	JMXWrapper.unregisterAllCircuitBreakers();
     }