Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix trashcan cleaner job #46

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix trashcan cleaner job #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7239dbe
Use (day format) DAYS_TO_KEEP instead of KEY_TIME_TO_KEEP (millisecon…
Edmondi-Kacaj Apr 20, 2022
5059e8c
Add Descriptions for ClassName, and fields
Edmondi-Kacaj Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 23 additions & 22 deletions Backend/src/org/edu_sharing/repository/server/jobs/quartz/TrashcanCleanerJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map.Entry;

import java.util.concurrent.TimeUnit;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.namespace.NamespaceService;
import org.apache.log4j.Logger;
Expand All @@ -15,32 +15,35 @@
import org.quartz.JobDataMap;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.edu_sharing.repository.server.jobs.quartz.annotation.JobDescription;
import org.edu_sharing.repository.server.jobs.quartz.annotation.JobFieldDescription;

@JobDescription(description = "Cleanup trashcan ")
public class TrashcanCleanerJob extends AbstractJob {

protected static final long DEFAULT_TIME_TO_KEEP = -1;
protected static final int DEFAULT_DAYS_TO_KEEP = -1;
protected static final int DEFAULT_DELETE_BATCH_COUNT = 1000;

private static final String KEY_TIME_TO_KEEP = "timeToKeep";
private static final String KEY_DELETE_BATCH_COUNT = "batchSize";


@JobFieldDescription(description = "Days which should NOT be deleted, e.g. 30 -> keep the last 30 days (-1 -> Cleaning trashcan will be skipped )", sampleValue = "-1")
public int DAYS_TO_KEEP;
@JobFieldDescription(description = "How much nodes per run, e.g. 1000 ", sampleValue = "1000")
public int BATCH_COUNT;

@Override
public void execute(JobExecutionContext context) throws JobExecutionException {

JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();

try {

long time = jobDataMap.containsKey(KEY_TIME_TO_KEEP)
? jobDataMap.getLong(KEY_TIME_TO_KEEP)
: DEFAULT_TIME_TO_KEEP;

int batch = jobDataMap.containsKey(KEY_DELETE_BATCH_COUNT)
? jobDataMap.getInt(KEY_DELETE_BATCH_COUNT)
: DEFAULT_DELETE_BATCH_COUNT;
final int time = jobDataMap.containsKey("DAYS_TO_KEEP")
? jobDataMap.getInt("DAYS_TO_KEEP")
: DEFAULT_DAYS_TO_KEEP;

new TrashcanCleaner(time , batch).execute();

int batch = jobDataMap.containsKey("BATCH_COUNT")
? jobDataMap.getInt("BATCH_COUNT")
: DEFAULT_DELETE_BATCH_COUNT;

new TrashcanCleaner(TimeUnit.MILLISECONDS.convert(time, TimeUnit.DAYS),batch).execute();
} catch (Throwable t) {
throw new JobExecutionException(t);
}
Expand All @@ -66,15 +69,13 @@ public static class TrashcanCleaner {
private final String PROP_ARCHIVED_DATE = "{" + NamespaceService.SYSTEM_MODEL_1_0_URI + "}archivedDate";

TrashcanCleaner (long timeToKeep, int batchSize) {

this.timeToKeep = timeToKeep;
this.batchSize = batchSize;
}

void execute() throws Throwable {
this.batchSize = batchSize;
}

if (timeToKeep <= 0) {
void execute() throws Throwable {

if (timeToKeep < 0) {
logger.info("Cleaning trashcan will be skipped (timeToKeep undefined).");
return;
}
Expand Down