[server] Delete incomplete uploads (missing meta data)

1 files changed, 11 insertions, 3 deletions

diff --git a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java
index 929fbb2a..531f169a 100644
--- a/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java
+++ b/dozentenmodulserver/src/main/java/org/openslx/bwlp/sat/maintenance/DeleteOldImages.java
@@ -1,7 +1,9 @@
 package org.openslx.bwlp.sat.maintenance;
 
 import java.sql.SQLException;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;
@@ -63,14 +65,20 @@ public class DeleteOldImages implements Runnable {
 			return;
 		}
 		LOGGER.info("Looking for old image versions to delete");
-		List<LocalImageVersion> versions;
+		Set<LocalImageVersion> versions = new HashSet<>();
 		// First get a list of all image versions which reached their expire date,
 		// no matter if valid or invalid
 		try {
-			versions = DbImage.getExpiringLocalImageVersions(0);
+			List<LocalImageVersion> list = DbImage.getExpiringLocalImageVersions(0);
+			versions.addAll(list);
 		} catch (SQLException e) {
 			LOGGER.error("Will not be able to clean up old image versions");
-			return;
+		}
+		try {
+			List<LocalImageVersion> list = DbImage.getVersionsWithMissingData();
+			versions.addAll(list);
+		} catch (SQLException e) {
+			LOGGER.error("Will not be able to clean up invalid image versions");
 		}
 		// Mark all as invalid. This will also trigger mails if they have been valid before
 		try {