beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Command read rework

Browse source
This commit is contained in:
crschnick 2024-06-29 13:35:38 +00:00
parent f6c06b38c3
commit e6b6d9b325
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/io/xpipe/app/beacon/impl/ShellExecExchangeImpl.java
View file

@ -18,8 +18,10 @@ public class ShellExecExchangeImpl extends ShellExecExchange {
AtomicReference<String> err = new AtomicReference<>(); AtomicReference<String> err = new AtomicReference<>();
long exitCode; long exitCode;
try (var command = existing.getControl().command(msg.getCommand()).start()) { try (var command = existing.getControl().command(msg.getCommand()).start()) {
command.accumulateStdout(s -> out.set(s)); var r = command.readStdoutAndStderr();
command.accumulateStderr(s -> err.set(s)); out.set(r[0]);
err.set(r[1]);
command.close();
exitCode = command.getExitCode(); exitCode = command.getExitCode();
} }
return Response.builder() return Response.builder()

4
core/src/main/java/io/xpipe/core/process/CommandControl.java
View file

@ -69,9 +69,9 @@ public interface CommandControl extends ProcessControl {
void withStdoutOrThrow(FailableConsumer<InputStreamReader, Exception> c); void withStdoutOrThrow(FailableConsumer<InputStreamReader, Exception> c);
String readStdoutDiscardErr() throws Exception; String[] readStdoutAndStderr() throws Exception;
String readJoinedOutputOrThrow() throws Exception; String readStdoutDiscardErr() throws Exception;
String readStderrDiscardStdout() throws Exception; String readStderrDiscardStdout() throws Exception;