--- dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressTask.java 2016/01/28 10:27:13 2856 +++ dao/DaoAdresseVedligehold/src/main/java/dk/daoas/adressevedligehold/AddressTask.java 2016/02/05 08:01:18 2924 @@ -3,6 +3,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import dk.daoas.adressevedligehold.tasks.Task; +import dk.daoas.adressevedligehold.tasks.TaskLogger; import dk.daoas.adressevedligehold.util.TimingHelper; /* @@ -12,6 +13,8 @@ public class AddressTask extends Task { + private TaskLogger logger = TaskLogger.getInstance(); + AddressSource source; boolean writeBack; @@ -29,13 +32,13 @@ try { TimingHelper timer = new TimingHelper(); - System.out.println("Validating Source"); + logger.info("Validating Source"); source.validate(); - System.out.println("Reading data from DB"); + logger.info("Reading data from DB"); AddressManager addrManager = new AddressManager(); - System.out.println("Data is ready"); + logger.info("Data is ready"); EntryUgedage ugedage = new EntryUgedage(); //saml op på hvilke ugedage der er blevet behandlet @@ -63,10 +66,15 @@ addrManager.dumpChanged(); } - AddressReport report = new AddressReport(addrManager, entryCount, ugedage, source, timer, writeBack); + AddressReport report = new AddressReport(addrManager, entryCount, ugedage, source, timer, writeBack, addrManager.getDuplicateCount() ); report.sendRapport(); + if (writeBack) { + ReloadHelper.triggerReload( "Indlaesning/" + source.getDistributor() ); + } + + } catch(Exception e) { @@ -81,10 +89,10 @@ } finally { try { - System.out.println("Cleaning up resources"); + logger.info("Cleaning up resources"); source.close(); } catch (Exception e) { - System.out.println("Error during cleanup: " + e.getMessage() ); + logger.warning("Error during cleanup: ", e ); } } @@ -96,8 +104,8 @@ } @Override - public short getPercentCompleted() { - return 0; + public double getPercentCompleted() { + return -1; } @Override