diff --git a/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java b/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java index abd2d2bd..a233e2d1 100644 --- a/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java +++ b/src/main/java/com/commafeed/backend/service/DatabaseCleaningService.java @@ -16,7 +16,6 @@ import com.commafeed.backend.dao.FeedEntryDAO; import com.commafeed.backend.dao.FeedEntryStatusDAO; import com.commafeed.backend.dao.UnitOfWork; import com.commafeed.backend.model.Feed; -import com.commafeed.backend.model.FeedEntry; import com.commafeed.backend.model.FeedEntryStatus; /** @@ -35,25 +34,6 @@ public class DatabaseCleaningService { private final FeedEntryContentDAO feedEntryContentDAO; private final FeedEntryStatusDAO feedEntryStatusDAO; - public long cleanEntriesWithoutSubscriptions() { - log.info("cleaning entries without subscriptions"); - long total = 0; - int deleted = 0; - do { - deleted = new UnitOfWork(sessionFactory) { - @Override - protected Integer runInSession() throws Exception { - List entries = feedEntryDAO.findWithoutSubscriptions(BATCH_SIZE); - return feedEntryDAO.delete(entries); - } - }.run(); - total += deleted; - log.info("removed {} entries without subscriptions", total); - } while (deleted != 0); - log.info("cleanup done: {} entries without subscriptions deleted", total); - return total; - } - public long cleanFeedsWithoutSubscriptions() { log.info("cleaning feeds without subscriptions"); long total = 0; diff --git a/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java b/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java index b765f6a1..a4ad8c41 100644 --- a/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java +++ b/src/main/java/com/commafeed/backend/task/OldStatusesCleanupTask.java @@ -25,7 +25,7 @@ public class OldStatusesCleanupTask implements ScheduledTask { @Override public long getInitialDelay() { - return 5; + return 10; } @Override diff --git a/src/main/java/com/commafeed/backend/task/OrphansCleanupTask.java b/src/main/java/com/commafeed/backend/task/OrphansCleanupTask.java index 5691fe8b..31811235 100644 --- a/src/main/java/com/commafeed/backend/task/OrphansCleanupTask.java +++ b/src/main/java/com/commafeed/backend/task/OrphansCleanupTask.java @@ -14,14 +14,13 @@ public class OrphansCleanupTask implements ScheduledTask { @Override public void run() { - cleaner.cleanEntriesWithoutSubscriptions(); cleaner.cleanFeedsWithoutSubscriptions(); cleaner.cleanContentsWithoutEntries(); } @Override public long getInitialDelay() { - return 30; + return 5; } @Override