Minecraft/asys
Archived
0
Fork 0
Code Activity

Zond: команда запуска сервера перенесена в конфиг

Browse Source
This commit is contained in:
DmitriyMX
2017-08-13 17:50:40 +03:00
parent 7018873758
commit 0f213e1ba9
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
zond/src/main/java/asys/zond/Main.java
View File

@@ -23,7 +23,7 @@ public class Main {
private PipeInputStream proxyStdIn; private PipeInputStream proxyStdIn;
public static void main(String[] args) throws IOException { public static void main(String[] args) throws IOException {
new Main().start(args); new Main().start();
} }
private String printLogo() { private String printLogo() {
@@ -33,7 +33,7 @@ public class Main {
.reset().newline().toString(); .reset().newline().toString();
} }
private void start(String[] args) { private void start() {
if (Boolean.getBoolean("ansi.install")) if (Boolean.getBoolean("ansi.install"))
AnsiConsole.systemInstall(); AnsiConsole.systemInstall();
System.out.println(printLogo()); System.out.println(printLogo());
@@ -48,7 +48,7 @@ public class Main {
proxyStdIn = new PipeInputStream(); proxyStdIn = new PipeInputStream();
ZondCommandHandler commandHandler = new ZondCommandHandler(proxyStdIn); ZondCommandHandler commandHandler = new ZondCommandHandler(proxyStdIn);
startShell(commandHandler); startShell(commandHandler);
initExecCommand(args, Shell.getInstance().getOutput()); initExecCommand(Shell.getInstance().getOutput());
commandHandler.setExecutor(executor, commandLine); commandHandler.setExecutor(executor, commandLine);
} }
@@ -62,8 +62,8 @@ public class Main {
} }
} }
private void initExecCommand(String[] args, PrintStream stdout) { private void initExecCommand(PrintStream stdout) {
String cmdLine = Arrays.stream(args).collect(Collectors.joining(" ")); String cmdLine = Config.getInstance().getString("cmd.start");
commandLine = CommandLine.parse(cmdLine); commandLine = CommandLine.parse(cmdLine);
executor = new DefaultExecutor(); executor = new DefaultExecutor();
PumpStreamHandler pumpStreamHandler = new PumpStreamHandler(stdout, stdout, proxyStdIn); PumpStreamHandler pumpStreamHandler = new PumpStreamHandler(stdout, stdout, proxyStdIn);

2
zond/src/main/java/asys/zond/ZondCommandHandler.java
View File

@@ -105,7 +105,7 @@ public class ZondCommandHandler implements CommandHandler {
watchdog = new ZondExecuteWatchdog( watchdog = new ZondExecuteWatchdog(
ExecuteWatchdog.INFINITE_TIMEOUT, ExecuteWatchdog.INFINITE_TIMEOUT,
proxyStdIn, proxyStdIn,
Config.getInstance().getString("cmdkiller") Config.getInstance().getString("cmd.killer")
); );
executor.setWatchdog(watchdog); executor.setWatchdog(watchdog);

7
zond/src/main/resources/zond.properties
View File

@@ -4,9 +4,10 @@ port = 8779
passcode = testpassphrase passcode = testpassphrase
bridge.port = 8710 bridge.port = 8710
bridge.second = 5 bridge.second = 5
pingmonitor.delay = 2 pingmonitor.delay = 5
pingmonitor.maxlost = 6 pingmonitor.maxlost = 6
#Windows #Windows
#cmdkiller = taskkill /F /PID %PID #cmd.killer = taskkill /F /PID %PID
#Linux #Linux
cmdkiller = kill -KILL %PID cmd.killer = kill -KILL %PID
cmd.start = java -jar server.jar