diff --git a/cws-service/src/main/java/jpl/cws/console/HistoryCleanupDaemon.java b/cws-service/src/main/java/jpl/cws/console/HistoryCleanupDaemon.java index 3684ccaa..7c05c207 100644 --- a/cws-service/src/main/java/jpl/cws/console/HistoryCleanupDaemon.java +++ b/cws-service/src/main/java/jpl/cws/console/HistoryCleanupDaemon.java @@ -1,5 +1,6 @@ package jpl.cws.console; +import org.camunda.bpm.engine.HistoryService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +14,7 @@ public class HistoryCleanupDaemon extends Thread { private static final int THIS_THREAD_REPEAT_DELAY = 8 * 60 * 60000; // 8 hours @Autowired private CwsConsoleService cwsConsoleService; - + @Autowired private HistoryService historyService; @Autowired private CwsEmailerService cwsEmailerService; public void run() { @@ -28,7 +29,10 @@ public void run() { sleep(THIS_THREAD_REPEAT_DELAY); log.debug("Performing History Cleanup..."); - + + // Database history cleanup + historyService.cleanUpHistoryAsync(true); + cwsConsoleService.cleanupElasticsearch(); cwsConsoleService.sendWorkerLogCleanupTopicMessage();