From aaa391e46caabfc292d8705bc5dc25e5c8c538c1 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 05 Jan 2019 00:08:40 +0000
Subject: [PATCH] Job monitor...
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/JobsRest.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 b09f444..05c5d02 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
@@ -2,9 +2,12 @@
import de.micromata.borgbutler.BorgJob;
import de.micromata.borgbutler.BorgQueueExecutor;
+import de.micromata.borgbutler.cache.ButlerCache;
+import de.micromata.borgbutler.data.Repository;
import de.micromata.borgbutler.json.JsonUtils;
import de.micromata.borgbutler.server.rest.queue.JsonJob;
import de.micromata.borgbutler.server.rest.queue.JsonJobQueue;
+import org.apache.commons.collections4.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,9 +35,13 @@
BorgQueueExecutor borgQueueExecutor = BorgQueueExecutor.getInstance();
List<JsonJobQueue> queueList = new ArrayList<>();
for (String repo : borgQueueExecutor.getRepos()) {
+ Repository repository = ButlerCache.getInstance().getRepositoryArchives(repo);
+ String title = repository != null ? repository.getDisplayName() : repo;
List<BorgJob<?>> borgJobList = borgQueueExecutor.getJobListCopy(repo);
+ if (CollectionUtils.isEmpty(borgJobList))
+ continue;
JsonJobQueue queue = new JsonJobQueue()
- .setRepo(repo);
+ .setRepo(title);
queueList.add(queue);
queue.setJobs(new ArrayList<>(borgJobList.size()));
for (BorgJob<?> borgJob : borgJobList) {
--
Gitblit v1.10.0