This commit is contained in:
Anthony Stirling 2024-03-28 17:09:21 +00:00
parent fb1baaa275
commit 08e43cc89c
2 changed files with 21 additions and 17 deletions

View File

@ -12,7 +12,7 @@ plugins {
import com.github.jk1.license.render.* import com.github.jk1.license.render.*
group = 'stirling.software' group = 'stirling.software'
version = '0.22.4' version = '0.22.5'
sourceCompatibility = '17' sourceCompatibility = '17'
repositories { repositories {
@ -128,7 +128,7 @@ dependencies {
// implementation 'com.twelvemonkeys.imageio:imageio-xwd:3.10.1' // implementation 'com.twelvemonkeys.imageio:imageio-xwd:3.10.1'
implementation 'commons-io:commons-io:2.15.1' implementation 'commons-io:commons-io:2.15.1'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.4.0' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
//general PDF //general PDF

View File

@ -169,26 +169,30 @@ public class ProcessExecutor {
errorReaderThread.join(); errorReaderThread.join();
outputReaderThread.join(); outputReaderThread.join();
if (!liveUpdates) { if (outputLines.size() > 0) {
if (outputLines.size() > 0) { String outputMessage = String.join("\n", outputLines);
String outputMessage = String.join("\n", outputLines); messages += outputMessage;
messages += outputMessage; if (!liveUpdates) {
logger.info("Command output:\n" + outputMessage); logger.info("Command output:\n" + outputMessage);
} }
}
if (errorLines.size() > 0) { if (errorLines.size() > 0) {
String errorMessage = String.join("\n", errorLines); String errorMessage = String.join("\n", errorLines);
messages += errorMessage; messages += errorMessage;
if (!liveUpdates) {
logger.warn("Command error output:\n" + errorMessage); logger.warn("Command error output:\n" + errorMessage);
if (exitCode != 0) {
throw new IOException(
"Command process failed with exit code "
+ exitCode
+ ". Error message: "
+ errorMessage);
}
} }
} else if (exitCode != 0) { if (exitCode != 0) {
throw new IOException(
"Command process failed with exit code "
+ exitCode
+ ". Error message: "
+ errorMessage);
}
}
if (exitCode != 0) {
throw new IOException( throw new IOException(
"Command process failed with exit code " "Command process failed with exit code "
+ exitCode + exitCode