--- android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2011/04/18 16:26:42	1302
+++ android/TrainInfoService/src/dk/thoerup/traininfoservice/banedk/TimetableServlet.java	2011/04/19 11:52:39	1303
@@ -18,6 +18,7 @@
 import dk.thoerup.android.traininfo.common.TimetableBean;
 import dk.thoerup.circuitbreaker.CircuitBreakerException;
 import dk.thoerup.traininfoservice.Statistics;
+import dk.thoerup.traininfoservice.TraininfoSettings;;
 
 /**
  * Servlet implementation class TimetableServlet
@@ -36,11 +37,9 @@
 	public void init() throws ServletException {
 		super.init();
 		
-		boolean useAzureSite =  Boolean.parseBoolean( getServletContext().getInitParameter("useazuresite") );
-		int cacheTimeout =  Integer.parseInt( getServletContext().getInitParameter("cache_timeout") );
-		int replyTimeout =  Integer.parseInt( getServletContext().getInitParameter("reply_timeout") );
-		logger.info( "TimetableServlet, use azure site=" + useAzureSite + ", cache=" + cacheTimeout);
-		fetcher = new TimetableFetcher(useAzureSite,cacheTimeout,replyTimeout);
+
+		TraininfoSettings settings = (TraininfoSettings) getServletContext().getAttribute("settings");
+		fetcher = new TimetableFetcher(settings);
 	}
 	
 	@Override