third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3.4.8' into jenkins_auto_build

Browse Source
This commit is contained in:
tjq 2021-03-07 23:30:29 +08:00
commit adae2ccad6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
powerjob-official-processors/src/main/java/tech/powerjob/official/processors/impl/script/AbstractScriptProcessor.java
View File

@ -47,18 +47,22 @@ public abstract class AbstractScriptProcessor extends CommonBasicProcessor {
StringBuilder inputSB = new StringBuilder();
StringBuilder errorSB = new StringBuilder();
pool.execute(() -> copyStream(process.getInputStream(), inputSB, omsLogger));
pool.execute(() -> copyStream(process.getErrorStream(), errorSB, omsLogger));
boolean success = true;
String result;
try {
boolean success = process.waitFor() == 0;
String result = String.format("[INPUT]: %s;[ERROR]: %s", inputSB.toString(), errorSB.toString());
try (InputStream is = process.getInputStream(); InputStream es = process.getErrorStream()) {
return new ProcessResult(success, result);
}catch (InterruptedException ie) {
pool.execute(() -> copyStream(is, inputSB, omsLogger));
pool.execute(() -> copyStream(es, errorSB, omsLogger));
success = process.waitFor() == 0;
} catch (InterruptedException ie) {
omsLogger.info("SYSTEM ===> ScriptProcessor has been interrupted");
return new ProcessResult(false, "Interrupted");
} finally {
result = String.format("[INPUT]: %s;[ERROR]: %s", inputSB.toString(), errorSB.toString());
}
return new ProcessResult(success, result);
}
private String prepareScriptFile(Long instanceId, String processorInfo) throws IOException {