diff --git a/zond/src/main/java/asys/zond/Main.java b/zond/src/main/java/asys/zond/Main.java index 7ef8428..0dbbd8f 100644 --- a/zond/src/main/java/asys/zond/Main.java +++ b/zond/src/main/java/asys/zond/Main.java @@ -23,7 +23,7 @@ public class Main { private PipeInputStream proxyStdIn; public static void main(String[] args) throws IOException { - new Main().start(args); + new Main().start(); } private String printLogo() { @@ -33,7 +33,7 @@ public class Main { .reset().newline().toString(); } - private void start(String[] args) { + private void start() { if (Boolean.getBoolean("ansi.install")) AnsiConsole.systemInstall(); System.out.println(printLogo()); @@ -48,7 +48,7 @@ public class Main { proxyStdIn = new PipeInputStream(); ZondCommandHandler commandHandler = new ZondCommandHandler(proxyStdIn); startShell(commandHandler); - initExecCommand(args, Shell.getInstance().getOutput()); + initExecCommand(Shell.getInstance().getOutput()); commandHandler.setExecutor(executor, commandLine); } @@ -62,8 +62,8 @@ public class Main { } } - private void initExecCommand(String[] args, PrintStream stdout) { - String cmdLine = Arrays.stream(args).collect(Collectors.joining(" ")); + private void initExecCommand(PrintStream stdout) { + String cmdLine = Config.getInstance().getString("cmd.start"); commandLine = CommandLine.parse(cmdLine); executor = new DefaultExecutor(); PumpStreamHandler pumpStreamHandler = new PumpStreamHandler(stdout, stdout, proxyStdIn); diff --git a/zond/src/main/java/asys/zond/ZondCommandHandler.java b/zond/src/main/java/asys/zond/ZondCommandHandler.java index 40761d2..1330d8f 100644 --- a/zond/src/main/java/asys/zond/ZondCommandHandler.java +++ b/zond/src/main/java/asys/zond/ZondCommandHandler.java @@ -105,7 +105,7 @@ public class ZondCommandHandler implements CommandHandler { watchdog = new ZondExecuteWatchdog( ExecuteWatchdog.INFINITE_TIMEOUT, proxyStdIn, - Config.getInstance().getString("cmdkiller") + Config.getInstance().getString("cmd.killer") ); executor.setWatchdog(watchdog); diff --git a/zond/src/main/resources/zond.properties b/zond/src/main/resources/zond.properties index 30e7048..6c3d764 100644 --- a/zond/src/main/resources/zond.properties +++ b/zond/src/main/resources/zond.properties @@ -4,9 +4,10 @@ port = 8779 passcode = testpassphrase bridge.port = 8710 bridge.second = 5 -pingmonitor.delay = 2 +pingmonitor.delay = 5 pingmonitor.maxlost = 6 #Windows -#cmdkiller = taskkill /F /PID %PID +#cmd.killer = taskkill /F /PID %PID #Linux -cmdkiller = kill -KILL %PID \ No newline at end of file +cmd.killer = kill -KILL %PID +cmd.start = java -jar server.jar \ No newline at end of file