--- dao/DaoAdresseService/src/dk/daoas/daoadresseservice/DataLoader.java 2015/02/23 15:20:10 2351 +++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/DataLoader.java 2016/01/19 17:34:59 2833 @@ -1,10 +1,20 @@ package dk.daoas.daoadresseservice; import java.sql.SQLException; +import java.util.Properties; +import java.util.logging.Logger; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; import javax.servlet.ServletContext; import dk.daoas.daoadresseservice.admin.ServiceConfig; +import dk.daoas.daoadresseservice.beans.DataStatisticsBean; +import dk.daoas.daoadresseservice.db.DatabaseLayerImplementation; public class DataLoader { @@ -19,12 +29,12 @@ config = conf; } - public void doLoad() { + public void doLoad(String trigger) { synchronized(this) { if (isRunning == false) { isRunning = true; - Thread t = new Thread( new DataLoadWorker(this), "SearchDataLoader"); + Thread t = new Thread( new DataLoadWorker(this, trigger), "SearchDataLoader"); t.start(); } } @@ -46,9 +56,14 @@ public static class DataLoadWorker implements Runnable { + + static final Logger logger = Logger.getLogger(DataLoadWorker.class.getName()); + DataLoader loader; - public DataLoadWorker(DataLoader ld) { + String trigger; + public DataLoadWorker(DataLoader ld, String trigger) { this.loader = ld; + this.trigger = trigger; } @@ -57,12 +72,17 @@ try { - AdressSearch search = new AdressSearch(loader.config); + AddressSearch search = new AddressSearch(new DatabaseLayerImplementation(), loader.config); search.buildSearchStructures(); - AdressSearch oldSearch = (AdressSearch) loader.ctxt.getAttribute("search"); + 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(); } @@ -75,6 +95,53 @@ } + protected void sendStatusEmail(DataStatisticsBean newStats, DataStatisticsBean oldStats) { + Properties props = new Properties(); + props.put("mail.smtp.host", "10.30.1.28"); + + 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); + } catch (MessagingException e) { + logger.warning("Unable to send CircuitBreaker notification mail " + e ); + } + } + }