lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-29 16:11:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

More beacon server startup fixes

Browse Source
This commit is contained in:
Christopher Schnick
2022-12-19 21:19:44 +01:00
parent 32e9772154
commit 1dcd88e709
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
beacon/src/main/java/io/xpipe/beacon/BeaconServer.java
+6 -4
View File
@@ -9,6 +9,7 @@ import io.xpipe.core.util.XPipeInstallation;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.List;
/**
* Contains basic functionality to start, communicate, and stop a remote beacon server.
@@ -33,7 +34,7 @@ public class BeaconServer {
? " " + BeaconConfig.getDaemonArguments()
: ""));
Process process = Runtime.getRuntime().exec(command.toArray(String[]::new));
printDaemonOutput(process, ShellTypes.getPlatformDefault().flatten(command));
printDaemonOutput(process, command);
return process;
}
return null;
@@ -48,12 +49,13 @@ public class BeaconServer {
getDaemonDebugExecutable(installationBase), BeaconConfig.getDaemonArguments());
}
Process process = new ProcessBuilder(ShellTypes.getPlatformDefault().executeCommandListWithShell(command)).start();
printDaemonOutput(process, command);
var fullCommand = ShellTypes.getPlatformDefault().executeCommandListWithShell(command);
Process process = new ProcessBuilder(fullCommand).start();
printDaemonOutput(process, fullCommand);
return process;
}
private static void printDaemonOutput(Process proc, String command) {
private static void printDaemonOutput(Process proc, List<String> command) {
boolean print = BeaconConfig.printDaemonOutput();
if (print) {
System.out.println("Starting daemon: " + command);
core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
+2 -2
View File
@@ -13,10 +13,10 @@ public class XPipeInstallation {
public static String createExternalAsyncLaunchCommand(String installationBase, String arguments) {
var suffix = (arguments != null ? arguments : "");
if (OsType.getLocal().equals(OsType.LINUX)) {
return "nohup \"" + installationBase + "/app/bin/xpiped\" --external & disown" + suffix;
return "nohup \"" + installationBase + "/app/bin/xpiped\" --external " + suffix + " & disown";
}
return FileNames.join(installationBase, XPipeInstallation.getDaemonExecutablePath(OsType.getLocal())) + suffix;
return "\"" + FileNames.join(installationBase, XPipeInstallation.getDaemonExecutablePath(OsType.getLocal())) + "\" " + suffix;
}
public static String createExternalLaunchCommand(String command, String arguments) {