--- android/TrainInfoService/src/dk/thoerup/traininfoservice/CircuitBreakerListener.java	2010/10/04 17:38:13	1162
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/CircuitBreakerListener.java	2012/10/29 10:36:15	1867
@@ -4,12 +4,15 @@
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
+import javax.servlet.ServletRegistration;
 import javax.servlet.annotation.WebListener;
 
 import dk.thoerup.circuitbreaker.AccountingCircuitBreaker;
 import dk.thoerup.circuitbreaker.CircuitBreakerManager;
-import dk.thoerup.circuitbreaker.jmx.JMXWrapper;
-import dk.thoerup.circuitbreaker.notification.*;
+import dk.thoerup.circuitbreaker.LoggingCircuitBreaker;
+import dk.thoerup.circuitbreaker.notification.CompositeNotifier;
+import dk.thoerup.circuitbreaker.notification.JavaLogNotifier;
+import dk.thoerup.circuitbreaker.notification.MailNotifier;
 
 
 /**
@@ -30,25 +33,41 @@
     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") );
+        TraininfoSettings settings = SettingsListener.loadSettings( sce.getServletContext() );
+
         CircuitBreakerManager mgr = CircuitBreakerManager.getManager();
         
 		CompositeNotifier notif = new CompositeNotifier();
 		notif.addNotifier( new JavaLogNotifier() );
-		notif.addNotifier( new MailNotifier("traininfo@t-hoerup.dk", "torben@t-hoerup.dk", "192.168.10.5") );
-		
+		 
+		//only send mail on prod server
+		if (sce.getServletContext().getRealPath("/").startsWith("/home/app/")  ) {
+			String mailRecipient = settings.getMailRecipient();
+			
+			if (mailRecipient != null && (!mailRecipient.isEmpty() ) ) {
+				notif.addNotifier( new MailNotifier("traininfo@t-hoerup.dk", mailRecipient, "192.168.10.5") );
+			}
+    	}
         
-		AccountingCircuitBreaker banedk = new AccountingCircuitBreaker("banedk", threshold, timeout);
+		LoggingCircuitBreaker banedk = new LoggingCircuitBreaker("banedk", settings);
 		banedk.setNotifier(notif);
 		mgr.addCircuitBreaker( banedk );
 		
 		
-		AccountingCircuitBreaker metro = new AccountingCircuitBreaker("metro", threshold, timeout);
+		AccountingCircuitBreaker metro = new AccountingCircuitBreaker("metro", settings);
 		metro.setNotifier(notif);
 		mgr.addCircuitBreaker( metro );
 		
-		JMXWrapper.registerAllCircuitBreakers();
+		LoggingCircuitBreaker tritinfo = new LoggingCircuitBreaker("tritinfo", settings);
+		tritinfo.setNotifier(notif);
+		mgr.addCircuitBreaker( tritinfo );
+		
+		
+		ServletRegistration.Dynamic dynconf = sce.getServletContext().addServlet("circuitbreaker", dk.thoerup.circuitbreaker.web.CircuitBreakerServletBase.class );
+		dynconf.addMapping("/CircuitBreakerServlet");
+		dynconf.setInitParameter("readonly", "0");
+		
+		//JMXWrapper.registerAllCircuitBreakers();
     }
 
 	/**
@@ -58,7 +77,7 @@
     	logger.warning("Context Destroyed");
     	CircuitBreakerManager.getManager().shutdown(); 
 
-    	JMXWrapper.unregisterAllCircuitBreakers();
+    	//JMXWrapper.unregisterAllCircuitBreakers();
     }
 	
 }