--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/DataLoader.java	2016/06/08 15:31:27	3044
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/DataLoader.java	2016/06/09 09:53:13	3045
@@ -17,132 +17,139 @@
 import dk.daoas.daoadresseservice.db.DatabaseLayerImplementation;
 
 public class DataLoader {
-	
+
 	boolean isRunning = false;
-	
+
 	ServiceConfig config; 
-	
+
 	ServletContext ctxt;
 	public DataLoader(ServletContext ctxt,ServiceConfig conf) {
 		this.ctxt = ctxt;
-		
+
 		config = conf;
 	}
-	
+
 	public void doLoad(String trigger) {
 		synchronized(this) {
 			if (isRunning == false) {
 				isRunning = true;
-				
+
 				Thread t = new Thread( new DataLoadWorker(this, trigger), "SearchDataLoader");
 				t.start();
 			}
 		}
 	}
-	
+
 	public boolean isRunning() {
 		synchronized(this) {
 			return isRunning;	
 		}		
 	}
-	
+
 	protected void  setRunningFalse() {
 		synchronized(this) {
 			isRunning = false;
 		}
 	}
 
-	
-	
-	
+
+
+
 	public static class DataLoadWorker implements Runnable {
-		
+
 		static final Logger logger = Logger.getLogger(DataLoadWorker.class.getName());
-		
+
 		DataLoader loader;
 		String trigger;
 		public DataLoadWorker(DataLoader ld, String trigger) {
 			this.loader = ld;
 			this.trigger = trigger;
 		}
-		
+
 
 		@Override
 		public void run() {
-    	
-	    	
-	    	try {
-	    		AddressSearch search = new AddressSearch(new DatabaseLayerImplementation(), loader.config);
-	    		search.buildSearchStructures();
-	    		
-	    		AddressSearch oldSearch = (AddressSearch) loader.ctxt.getAttribute("search");
-	    		loader.ctxt.setAttribute("search", search);
-	    		
-	    		if (loader.config.notifyEmail != null && loader.config.notifyEmail.length() > 0) {
-	    			DataStatisticsBean oldStats = oldSearch != null ? oldSearch.getStatistics() : null;
-	    			sendStatusEmail(search.getStatistics(), oldStats);
-	    		}
-	    		
-	    		if (oldSearch != null) {
-	    			oldSearch.clear();
-	    		}
-	    			    		
-	    	} catch (SQLException e) {
-	    		System.out.println("Error loading data: " + e.getMessage());
-	    	} finally {
-	    		loader.setRunningFalse();
-	    	}
-	    	
+
+
+			try {
+				AddressSearch search = new AddressSearch(new DatabaseLayerImplementation(), loader.config);
+				search.buildSearchStructures();
+
+				AddressSearch oldSearch = (AddressSearch) loader.ctxt.getAttribute("search");
+				loader.ctxt.setAttribute("search", search);
+
+				if (loader.config.notifyEmail != null && loader.config.notifyEmail.length() > 0) {
+					DataStatisticsBean oldStats = oldSearch != null ? oldSearch.getStatistics() : null;
+					sendStatusEmail(search.getStatistics(), oldStats);
+				}
+
+				if (oldSearch != null) {
+					oldSearch.clear();
+				}
+
+			} catch (Exception e) {
+				sendEmail("Load errror", "Error loading data: " + e.getMessage() );
+				System.out.println("Error loading data: " + e.getMessage() );
+				e.printStackTrace();
+				
+			} finally {
+				loader.setRunningFalse();
+			}
+
 		}
-		
-		protected void sendStatusEmail(DataStatisticsBean newStats, DataStatisticsBean oldStats) {
+
+		protected void sendEmail(String subject, String body) {
 			Properties props = new Properties();
 			props.put("mail.smtp.host", "10.30.1.28");
-			
+
+			// create a message
 			try {
-					// create some properties and get the default Session
-					Session session = Session.getDefaultInstance(props, null);
-					session.setDebug(false);
-					
-					
-					String body = "Trigger: " + trigger + "\r\n\r\n";
-					body += "New stats:\r\n";
-					
-					body += "Direkte:      " + newStats.direkteCount + "\r\n";
-					body += "Extended:     " + newStats.extendedCount + "\r\n";
-					body += "100%:         " + newStats.hundredePctCount + "\r\n";
-					body += "Ikke-daekket: " + newStats.ikkeDaekketCount + "\r\n";
-					body += "Total:        " + newStats.totalCount + "\r\n";					
-					body += "Elapsed:      " + newStats.elapsed + "\r\n";
-					
-					if (oldStats != null) {
-						body += "\r\n";
-						body += "Delta to previous\r\n";
-						body += "Direkte:      " + (newStats.direkteCount-oldStats.direkteCount) + "\r\n";
-						body += "Extended:     " + (newStats.extendedCount-oldStats.extendedCount) + "\r\n";
-						body += "100:          " + (newStats.hundredePctCount-oldStats.hundredePctCount) + "\r\n";
-						body += "Ikke-daekket: " + (newStats.ikkeDaekketCount-oldStats.ikkeDaekketCount) + "\r\n";
-						body += "Total:        " + (newStats.totalCount-oldStats.totalCount) + "\r\n";
-						
-					}
-							
-					
-					// create a message
-					
-					MimeMessage msg = new MimeMessage(session);
-					msg.setFrom( new InternetAddress("no-reply@daoas.dk") );
-					
-					msg.setRecipient(Message.RecipientType.TO, new InternetAddress(loader.config.notifyEmail) );
-					msg.setSubject("DaoAdresseService load, trigger: " + trigger);			
-					msg.setText(body);
-					
-					Transport.send(msg);
+
+				// create some properties and get the default Session
+				Session session = Session.getDefaultInstance(props, null);
+				session.setDebug(false);
+
+				MimeMessage msg = new MimeMessage(session);
+				msg.setFrom( new InternetAddress("no-reply@daoas.dk") );
+
+				msg.setRecipient(Message.RecipientType.TO, new InternetAddress(loader.config.notifyEmail) );
+				msg.setSubject(subject);			
+				msg.setText(body);
+
+				Transport.send(msg);
 			} catch (MessagingException e) {
 				logger.warning("Unable to send CircuitBreaker notification mail " + e );
 			}
+
+
 		}
-		
 
+		protected void sendStatusEmail(DataStatisticsBean newStats, DataStatisticsBean oldStats) {
+
+			String body = "Trigger: " + trigger + "\r\n\r\n";
+			body += "New stats:\r\n";
+
+			body += "Direkte:      " + newStats.direkteCount + "\r\n";
+			body += "Extended:     " + newStats.extendedCount + "\r\n";
+			body += "100%:         " + newStats.hundredePctCount + "\r\n";
+			body += "Ikke-daekket: " + newStats.ikkeDaekketCount + "\r\n";
+			body += "Total:        " + newStats.totalCount + "\r\n";					
+			body += "Elapsed:      " + newStats.elapsed + "\r\n";
+
+			if (oldStats != null) {
+				body += "\r\n";
+				body += "Delta to previous\r\n";
+				body += "Direkte:      " + (newStats.direkteCount-oldStats.direkteCount) + "\r\n";
+				body += "Extended:     " + (newStats.extendedCount-oldStats.extendedCount) + "\r\n";
+				body += "100:          " + (newStats.hundredePctCount-oldStats.hundredePctCount) + "\r\n";
+				body += "Ikke-daekket: " + (newStats.ikkeDaekketCount-oldStats.ikkeDaekketCount) + "\r\n";
+				body += "Total:        " + (newStats.totalCount-oldStats.totalCount) + "\r\n";
+
+			}
+
+			sendEmail("DaoAdresseService load, trigger: " + trigger, body);
+
+		}
 	}
 
 }