From 00305fbac9386be9bae9cbb2e3978f0b7aeda48e Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 13 Jan 2021 09:18:30 +0100
Subject: [PATCH] OO-5224: Enable job to delete expired document accesses
---
.../services/_spring/servicesCorecontext.xml | 20 +++++++++++--------
.../scheduler/_spring/schedulerContext.xml | 1 +
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml b/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml
index e84d4aeafdf..96fb0acb033 100644
--- a/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml
+++ b/src/main/java/org/olat/core/commons/services/_spring/servicesCorecontext.xml
@@ -119,14 +119,18 @@
</bean>
<!-- Cleaning job for document editor access -->
- <bean id="expiredDocumentAccessDeletionJob" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
- <property name="jobDetail">
- <bean class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
- <property name="jobClass" value="org.olat.core.commons.services.doceditor.manager.ExpiredDocumentAccessDeletionJob" />
- </bean>
- </property>
- <property name="cronExpression" value="52 * * * * ?"/> <!-- Every minute at xx:xx:52 -->
- <property name="startDelay" value="45000" />
+ <bean id="documentAccessDeletionTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+ <property name="jobDetail" ref="documentAccessDeletionJob.${cluster.singleton.services}" />
+ <property name="cronExpression" value="* 24 * * * ?" /> <!-- Every hour at xx:24:00 -->
+ <property name="startDelay" value="10000" />
+ </bean>
+
+ <bean id="documentAccessDeletionJob.enabled" class="org.springframework.scheduling.quartz.JobDetailFactoryBean" lazy-init="true">
+ <property name="jobClass" value="org.olat.core.commons.services.doceditor.manager.ExpiredDocumentAccessDeletionJob" />
+ </bean>
+
+ <bean id="documentAccessDeletionJob.disabled" class="org.springframework.scheduling.quartz.JobDetailFactoryBean" lazy-init="true">
+ <property name="jobClass" value="org.olat.core.commons.services.scheduler.DummyJob" />
</bean>
<!-- Cleaning job for CSP reports -->
diff --git a/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml b/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
index 5a48827b6b5..907b85c71e4 100644
--- a/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
+++ b/src/main/java/org/olat/core/commons/services/scheduler/_spring/schedulerContext.xml
@@ -60,6 +60,7 @@ How to add a new job:
<ref bean="lifecycleUserTrigger"/>
<ref bean="contactTracingTrigger"/>
<ref bean="recordingSyncTrigger"/>
+ <ref bean="documentAccessDeletionTrigger"/>
</list>
</property>
</bean>
--
GitLab