From 0e0d4d801b55c224b60fca5e62fd648206cdbf09 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 04 Jan 2019 23:55:22 +0000
Subject: [PATCH] Job monitor...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
index dac519a..0c3a8e9 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgJob.java
@@ -47,6 +47,9 @@
@Override
protected CommandLine buildCommandLine() {
+ if (command == null) {
+ return null;
+ }
CommandLine commandLine = new CommandLine(ConfigurationHandler.getConfiguration().getBorgCommand());
commandLine.addArgument(command.getCommand());
if (command.getParams() != null) {
@@ -68,12 +71,10 @@
}
protected void processStdErrLine(String line, int level) {
- log.info(line);
try {
if (StringUtils.startsWith(line, "{\"message")) {
ProgressMessage message = JsonUtils.fromJson(ProgressMessage.class, line);
if (message != null) {
- log.info(JsonUtils.toJson(progressMessage));
progressMessage = message;
return;
}
@@ -114,6 +115,9 @@
clone.setStatus(getStatus());
clone.setWorkingDirectory(getWorkingDirectory());
clone.setDescription(getDescription());
+ if (progressMessage != null) {
+ clone.setProgressMessage(progressMessage.clone());
+ }
return clone;
}
}
--
Gitblit v1.10.0