ChromaGaming/ButtonServerRunner
1
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity

Prevent Ctrl+D from stopping input

Browse source 
(A couple hours ago, like 10-12)
This commit is contained in:
Norbi Peti 2019-11-01 02:23:28 +01:00
parent 3857c85bea
commit 7b4471c606
No known key found for this signature in database
GPG key ID: DBA4C4549A927E56
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/buttondevteam/serverrunner/ServerRunner.java
View file

@ -25,6 +25,7 @@ public class ServerRunner {
private static volatile Thread rt; private static volatile Thread rt;
private static volatile ConsoleReader reader; private static volatile ConsoleReader reader;
private static volatile PrintWriter runnerout; private static volatile PrintWriter runnerout;
private static volatile Thread it;
private static volatile boolean customrestartfailed = false; private static volatile boolean customrestartfailed = false;
@ -51,15 +52,15 @@ public class ServerRunner {
serverprocess = startServer(config, serverJar); serverprocess = startServer(config, serverJar);
serveroutput = new PrintWriter(serverprocess.getOutputStream()); serveroutput = new PrintWriter(serverprocess.getOutputStream());
rt = Thread.currentThread(); rt = Thread.currentThread();
final Thread it = new Thread() { it = new Thread() {
@Override @Override
public void run() { public void run() {
try { try {
String readLine; String readLine;
while (!stop) { while (!stop || serveroutput.) { //TODO: Store if stream got closed (enum for state)?
try { try {
if ((readLine = reader.readLine()) == null) if ((readLine = reader.readLine()) == null)
break; continue; //Keep going until we stop
if (readLine.equalsIgnoreCase("stop")) if (readLine.equalsIgnoreCase("stop"))
ServerRunner.stop(); ServerRunner.stop();
serveroutput.println(readLine); serveroutput.println(readLine);
@ -194,12 +195,8 @@ public class ServerRunner {
} }
private static Process startServer(Config config, File serverJar) throws IOException { private static Process startServer(Config config, File serverJar) throws IOException {
ProcessBuilder pb = new ProcessBuilder("bash", "-i", "-c", "java " + config.serverParams + " -jar " + serverJar.getPath()); ProcessBuilder pb = new ProcessBuilder(("java " + config.serverParams + " -jar " + serverJar.getPath()).split(" ")); //Need to use split() because of the supplied params
pb.environment().put("TERM", "xterm");
Terminal t;
return pb.start(); return pb.start();
/*return Runtime.getRuntime().exec(,
new String[] { "TERM=xterm" }); //Need to use split() because of the supplied params*/
} }
private static void sendMessage(PrintWriter output, String color, String text) { private static void sendMessage(PrintWriter output, String color, String text) {
@ -211,6 +208,7 @@ public class ServerRunner {
private static void stop() { private static void stop() {
stop = true; stop = true;
rt.interrupt(); // The restarter thread sleeps for a long time and keeps the program running rt.interrupt(); // The restarter thread sleeps for a long time and keeps the program running
it.interrupt(); // The input thread will listen until it's stopped
} }
private static void writeToScreen(String line) { private static void writeToScreen(String line) {