Fixed import process cleanup

SouthGreenPlatform · Sep 6, 2024 · 14baa09 · 14baa09
1 parent b67d338
commit 14baa09
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git 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
@@ -662,12 +662,8 @@ public void registerImportProcess(ImportProcess process) {
  public Map<String, AbstractProcess> 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()) {