Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-11-16 01:21:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge c05d1eb916 into be824b126f

Browse Source
This commit is contained in:
Balázs Szücs 2025-11-15 15:31:18 +00:00 committed by GitHub
commit c0c0454cfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java
View File

@ -12,6 +12,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import io.github.pixee.security.BoundedLineReader;
@ -25,6 +26,7 @@ import stirling.software.common.model.ApplicationProperties;
public class ProcessExecutor {
private static final Map<Processes, ProcessExecutor> instances = new ConcurrentHashMap<>();
private static final String ERROR_KEYWORD = "ERROR";
private static ApplicationProperties applicationProperties = new ApplicationProperties();
private final Semaphore semaphore;
private final boolean liveUpdates;
@ -175,6 +177,7 @@ public class ProcessExecutor {
String messages = "";
int exitCode = 1;
semaphore.acquire();
AtomicBoolean errorDetected = new AtomicBoolean(false);
try {
log.info("Running command: {}", String.join(" ", command));
@ -204,7 +207,16 @@ public class ProcessExecutor {
errorReader, 5_000_000))
!= null) {
errorLines.add(line);
if (liveUpdates) log.info(line);
if (liveUpdates) {
if (line.toUpperCase().contains(ERROR_KEYWORD)) {
errorDetected.set(true);
}
if (errorDetected.get()) {
log.info(line);
} else {
log.debug(line);
}
}
}
} catch (InterruptedIOException e) {
log.warn("Error reader thread was interrupted due to timeout.");
@ -227,7 +239,16 @@ public class ProcessExecutor {
outputReader, 5_000_000))
!= null) {
outputLines.add(line);
if (liveUpdates) log.info(line);
if (liveUpdates) {
if (line.toUpperCase().contains(ERROR_KEYWORD)) {
errorDetected.set(true);
}
if (errorDetected.get()) {
log.info(line);
} else {
log.debug(line);
}
}
}
} catch (InterruptedIOException e) {
log.warn("Error reader thread was interrupted due to timeout.");