The Unified and Autonomous Development Platform
chore: Only clean job cache for active projects
Robin Shena57da674e645
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.javaindex d6a9efa411..5ac1fd3da8 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultJobCacheManager.java@@ -27,6 +27,8 @@ import org.hibernate.exception.ConstraintViolationException;import org.joda.time.DateTime;import org.quartz.CronScheduleBuilder;import org.quartz.ScheduleBuilder;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;import javax.annotation.Nullable;import javax.inject.Inject;@@ -59,6 +61,8 @@ public class DefaultJobCacheManager extends BaseEntityManager<JobCache>private static final int CACHE_VERSION = 1;+ private static final Logger logger = LoggerFactory.getLogger(DefaultJobCacheManager.class);+private final ProjectManager projectManager;private final SessionManager sessionManager;@@ -425,14 +429,19 @@ public class DefaultJobCacheManager extends BaseEntityManager<JobCache>@Overridepublic void execute() {var now = new DateTime();- for (var project: projectManager.query()) {- var preserveDays = project.getHierarchyCachePreserveDays();- var threshold = now.minusDays(preserveDays);- var criteria = newCriteria();- criteria.add(Restrictions.eq(PROP_PROJECT, project));- criteria.add(Restrictions.lt(PROP_ACCESS_DATE, threshold.toDate()));- for (var cache: query(criteria))- delete(cache);+ for (var projectId: projectManager.getActiveIds()) {+ try {+ var project = projectManager.load(projectId);+ var preserveDays = project.getHierarchyCachePreserveDays();+ var threshold = now.minusDays(preserveDays);+ var criteria = newCriteria();+ criteria.add(Restrictions.eq(PROP_PROJECT, project));+ criteria.add(Restrictions.lt(PROP_ACCESS_DATE, threshold.toDate()));+ for (var cache: query(criteria))+ delete(cache);+ } catch (Exception e) {+ logger.error("Error cleaning up job caches", e);+ }}}