DMC/seshat
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Logging and queing #21

Merged
niat8586 merged 10 commits from develop into main 2025-02-09 15:57:45 +01:00
Conversation 0 Commits 10 Files Changed 2 +14 -4
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b56109eb4d - Show all commits

18
src/main/java/se/su/dsv/seshat/services/JobProcessorService.java
View File

@ -15,6 +15,7 @@ import se.su.dsv.seshat.repositories.FileMetadataRepository;
import java.io.File; import java.io.File;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Comparator;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
@ -62,12 +63,21 @@ public class JobProcessorService {
worker.start(); worker.start();
} }
/**
* Add all jobs that have been in a processing status or pending status
* to the queue when the application starts.
* Ensuring that all jobs are processed even if the application is restarted
* wihtout the user having to re-upload the files.
*/
@Transactional @Transactional
public void addPendingJobsToQueue() { public void addPendingJobsToQueue() {
List<FileMetadata> pendingJobs = fileMetadataRepository.findByJobStatus(JobStatus.PENDING); List<FileMetadata> processingJobs = fileMetadataRepository.findByJobStatus(JobStatus.PROCESSING);
for (FileMetadata job : pendingJobs) { processingJobs.addAll(fileMetadataRepository.findByJobStatus(JobStatus.PENDING));
jobQueue.offer(job);
} processingJobs.sort(Comparator.comparing(FileMetadata::getUploadedAt));
processingJobs.forEach(this::addJob);
} }
@Transactional @Transactional