diff --git a/src/main/java/fr/cirad/manager/ScheduledTaskManager.java b/src/main/java/fr/cirad/manager/ScheduledTaskManager.java index 2b727924..fa917821 100644 --- a/src/main/java/fr/cirad/manager/ScheduledTaskManager.java +++ b/src/main/java/fr/cirad/manager/ScheduledTaskManager.java @@ -18,6 +18,7 @@ import fr.cirad.mgdb.importing.OntologyImport; import fr.cirad.tools.AppConfig; +import fr.cirad.tools.GigwaModuleManager; import fr.cirad.tools.mongo.MongoTemplateManager; import fr.cirad.tools.security.TokenManager; @@ -42,8 +43,9 @@ public class ScheduledTaskManager { static private final org.apache.log4j.Logger LOG = org.apache.log4j.Logger.getLogger(ScheduledTaskManager.class); @Autowired private AppConfig appConfig; - @Autowired TokenManager tokenManager; - + @Autowired private TokenManager tokenManager; + @Autowired private GigwaModuleManager moduleManager; + /** * remove old tokens and drop associated temporary collections, executed every 6 hours */ @@ -83,4 +85,12 @@ public void onStartup() { LOG.info("CAS authentication enabled with " + casServerURL); } } + + /** + * Clean old finished processes regularly + */ + @Scheduled(fixedRate = 86400000) + public void cleanupCompleteImportProcesses() { + moduleManager.cleanupCompleteImportProcesses(); + } } diff --git a/src/main/java/fr/cirad/tools/GigwaModuleManager.java b/src/main/java/fr/cirad/tools/GigwaModuleManager.java index 8420ef2d..cd18f1b4 100644 --- a/src/main/java/fr/cirad/tools/GigwaModuleManager.java +++ b/src/main/java/fr/cirad/tools/GigwaModuleManager.java @@ -662,12 +662,8 @@ public void registerImportProcess(ImportProcess process) { public Map getImportProcesses() { return importProcesses; } - - /** - * Clean old finished processes regularly - */ - @Scheduled(fixedRate = 86400000) - public void cleanupFinishedProcesses() { + + public void cleanupCompleteImportProcesses() { for (String processID : importProcesses.keySet()) { AbstractProcess process = importProcesses.get(processID); if (process.getStatus().isFinal()) {