From de7d8d4cfbf9fe9fa6dcc7fd054301f52e47f9eb Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 28 Dec 2018 22:27:48 +0000
Subject: [PATCH] Job queueing...
---
borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java | 75 +++++--------------------------------
1 files changed, 10 insertions(+), 65 deletions(-)
diff --git a/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java b/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java
index 8c2a163..ed9b98b 100644
--- a/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java
+++ b/borgbutler-core/src/test/java/de/micromata/borgbutler/jobs/TestJob.java
@@ -1,23 +1,16 @@
package de.micromata.borgbutler.jobs;
-import lombok.Getter;
-import org.apache.commons.exec.*;
-import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.commons.exec.CommandLine;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-public class TestJob extends AbstractJob<String> {
+public class TestJob extends AbstractCommandLineJob {
private Logger log = LoggerFactory.getLogger(TestJob.class);
private int time;
private File counterScript;
private int failOn = -1;
- private ExecuteWatchdog watchdog;
- @Getter
- private boolean executeStarted;
TestJob(int time, File counterScript) {
this(time, -1, counterScript);
@@ -35,65 +28,17 @@
}
@Override
- protected void cancelRunningProcess() {
- log.info("CancelRunningProcess: " + watchdog + ", " + getStatus());
- if (watchdog != null) {
- log.info("Cancelling job: " + getId());
- watchdog.destroyProcess();
- watchdog = null;
- setCancelled();
- }
+ protected CommandLine buildCommandLine() {
+ CommandLine commandLine = new CommandLine(counterScript.getAbsolutePath());
+ commandLine.addArgument(String.valueOf(this.time));
+ commandLine.addArgument(String.valueOf(this.failOn));
+ return commandLine;
}
@Override
- public String execute() {
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- ByteArrayOutputStream errorOutputStream = new ByteArrayOutputStream();
- CommandLine cmdLine = new CommandLine(counterScript.getAbsolutePath());
- cmdLine.addArgument(String.valueOf(this.time));
- cmdLine.addArgument(String.valueOf(this.failOn));
- DefaultExecutor executor = new DefaultExecutor();
- watchdog = new ExecuteWatchdog(ExecuteWatchdog.INFINITE_TIMEOUT);
- executor.setWatchdog(watchdog);
- PumpStreamHandler streamHandler = new PumpStreamHandler(new LogOutputStream() {
- @Override
- protected void processLine(String line, int level) {
- //log.info(line);
- try {
- outputStream.write(line.getBytes());
- outputStream.write("\n".getBytes());
- } catch (IOException ex) {
- log.error(ex.getMessage(), ex);
- }
- }
- }, new LogOutputStream() {
- @Override
- protected void processLine(String line, int logLevel) {
- //log.error(line);
- try {
- errorOutputStream.write(line.getBytes());
- errorOutputStream.write("\n".getBytes());
- } catch (IOException ex) {
- log.error(ex.getMessage(), ex);
- }
- }
- });
- executor.setStreamHandler(streamHandler);
- if (isCancelledRequested()) {
- setCancelled();
- return null;
+ protected void afterFailure(Exception ex) {
+ if (failOn < 0 && getStatus() != Status.CANCELLED) {
+ log.error("Error while executing script '" + getCommandLineAsString() + "': " + ex.getMessage(), ex);
}
- log.info("Executing '" + counterScript.getAbsolutePath() + " " + this.time + "'...");
- executeStarted = true;
- try {
- executor.execute(cmdLine);
- } catch (Exception ex) {
- failed();
- if (failOn < 0 && getStatus() != Status.CANCELLED) {
- log.error("Error while executing script: " + ex.getMessage(), ex);
- }
- }
- return outputStream.toString(Charset.forName("UTF-8"));
- //log.error(errorOutputStream.toString(Charset.forName("UTF-8")));
}
}
--
Gitblit v1.10.0