slhaf/Partner
1
0
Fork 0
mirror of https://github.com/slhaf/Partner.git synced 2026-05-12 08:43:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(CommandExecutionService): avoid persistent reader executor

Browse Source
This commit is contained in:
slhafzjw
2026-04-19 17:30:16 +08:00
parent c5aa558319
commit 137b1ee917
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Partner-Core/src/main/java/work/slhaf/partner/core/action/runner/execution/CommandExecutionService.java
View File

@@ -10,16 +10,12 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
public class CommandExecutionService { public class CommandExecutionService {
public static final CommandExecutionService INSTANCE = new CommandExecutionService(); public static final CommandExecutionService INSTANCE = new CommandExecutionService();
private final ExecutorService readerExecutor = Executors.newVirtualThreadPerTaskExecutor();
private CommandExecutionService() { private CommandExecutionService() {
} }
@@ -47,7 +43,7 @@ public class CommandExecutionService {
try { try {
Process process = startProcess(launchSpec); Process process = startProcess(launchSpec);
Thread stdoutThread = new Thread(() -> { Thread stdoutThread = Thread.startVirtualThread(() -> {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
@@ -57,7 +53,7 @@ public class CommandExecutionService {
} }
}); });
Thread stderrThread = new Thread(() -> { Thread stderrThread = Thread.startVirtualThread(() -> {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) { try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
@@ -67,9 +63,6 @@ public class CommandExecutionService {
} }
}); });
readerExecutor.execute(stdoutThread);
readerExecutor.execute(stderrThread);
int exitCode = process.waitFor(); int exitCode = process.waitFor();
stdoutThread.join(); stdoutThread.join();
stderrThread.join(); stderrThread.join();
@@ -103,8 +96,8 @@ public class CommandExecutionService {
session.setStdoutBuffer(stdoutBuffer); session.setStdoutBuffer(stdoutBuffer);
session.setStderrBuffer(stderrBuffer); session.setStderrBuffer(stderrBuffer);
readerExecutor.execute(() -> readToBuffer(process.getInputStream(), stdoutBuffer)); Thread.startVirtualThread(() -> readToBuffer(process.getInputStream(), stdoutBuffer));
readerExecutor.execute(() -> readToBuffer(process.getErrorStream(), stderrBuffer)); Thread.startVirtualThread(() -> readToBuffer(process.getErrorStream(), stderrBuffer));
return session; return session;
} catch (Exception e) { } catch (Exception e) {