From 8252cc6a94dc6fb2bb2b6d02898ca5113fd3b3a5 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Tue, 15 Jan 2019 23:13:16 +0000
Subject: [PATCH] Show old jobs...
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/JobsRest.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/JobsRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/JobsRest.java
index a74ab74..7c6539c 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/JobsRest.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/JobsRest.java
@@ -39,6 +39,7 @@
*/
public String getJobs(@QueryParam("repo") String repo,
@QueryParam("testMode") boolean testMode,
+ @QueryParam("oldJobs") boolean oldJobs,
@QueryParam("prettyPrinter") boolean prettyPrinter) {
if (testMode) {
// Return dynamic test queue:
@@ -51,13 +52,13 @@
BorgQueueExecutor borgQueueExecutor = BorgQueueExecutor.getInstance();
List<JsonJobQueue> queueList = new ArrayList<>();
if (validRepo) { // Get only the queue of the given repo:
- JsonJobQueue queue = getQueue(repo);
+ JsonJobQueue queue = getQueue(repo, oldJobs);
if (queue != null) {
queueList.add(queue);
}
} else { // Get all the queues (of all repos).
for (String rep : borgQueueExecutor.getRepos()) {
- JsonJobQueue queue = getQueue(rep);
+ JsonJobQueue queue = getQueue(rep, oldJobs);
if (queue != null) {
queueList.add(queue);
}
@@ -66,13 +67,13 @@
return JsonUtils.toJson(queueList, prettyPrinter);
}
- private JsonJobQueue getQueue(String repo) {
+ private JsonJobQueue getQueue(String repo, boolean oldJobs) {
BorgQueueExecutor borgQueueExecutor = BorgQueueExecutor.getInstance();
BorgRepoConfig repoConfig = ConfigurationHandler.getConfiguration().getRepoConfig(repo);
if (repoConfig == null) {
return null;
}
- List<BorgJob<?>> borgJobList = borgQueueExecutor.getJobListCopy(repoConfig);
+ List<BorgJob<?>> borgJobList = borgQueueExecutor.getJobListCopy(repoConfig, oldJobs);
if (CollectionUtils.isEmpty(borgJobList))
return null;
JsonJobQueue queue = new JsonJobQueue().setRepo(repoConfig.getDisplayName());
--
Gitblit v1.10.0