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

Added memory argument

Browse source
This commit is contained in:
Norbi Peti 2016-08-26 18:20:16 +02:00
parent 10d5ff8c28
commit b30a7de82f
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,8 +21,28 @@ public class ServerRunner {
private static volatile Thread rt; private static volatile Thread rt;
public static void main(String[] args) throws IOException, InterruptedException { public static void main(String[] args) throws IOException, InterruptedException {
String minmem = "512M";
String maxmem = "1G";
if (args.length == 2) {
if ((!args[0].contains("G") && !args[0].contains("M"))
|| (!args[1].contains("G") && !args[0].contains("M"))) {
System.out.println("Error: Invalid arguments.");
System.out.println("Usage: java -jar <minmem> <maxmem>");
System.out.println("Example: java -jar 1G 2G");
return;
}
minmem = args[0];
maxmem = args[1];
} else if (args.length > 2) {
System.out.println("Error: Too many arguments.");
System.out.println("Usage: java -jar <minmem> <maxmem>");
System.out.println("Example: java -jar 1G 2G");
return;
}
final String fminmem = minmem;
final String fmaxmem = maxmem;
System.out.println("Starting server..."); System.out.println("Starting server...");
serverprocess = startServer(); serverprocess = startServer(minmem, maxmem);
output = new PrintWriter(serverprocess.getOutputStream()); output = new PrintWriter(serverprocess.getOutputStream());
rt = Thread.currentThread(); rt = Thread.currentThread();
final Thread it = new Thread() { final Thread it = new Thread() {
@ -74,7 +94,7 @@ public class ServerRunner {
} catch (Exception e) { } catch (Exception e) {
} }
System.out.println("Server stopped! Restarting..."); System.out.println("Server stopped! Restarting...");
serverprocess = startServer(); serverprocess = startServer(fminmem, fmaxmem);
input = new BufferedReader(new InputStreamReader(serverprocess.getInputStream())); input = new BufferedReader(new InputStreamReader(serverprocess.getInputStream()));
output = new PrintWriter(serverprocess.getOutputStream()); output = new PrintWriter(serverprocess.getOutputStream());
restartcounter = RESTART_MESSAGE_COUNT; restartcounter = RESTART_MESSAGE_COUNT;
@ -114,9 +134,9 @@ public class ServerRunner {
System.out.println("Stopped " + Thread.currentThread().getName()); System.out.println("Stopped " + Thread.currentThread().getName());
} }
private static Process startServer() throws IOException { private static Process startServer(String minmem, String maxmem) throws IOException {
return Runtime.getRuntime().exec(new String[] { "java", "-Xms512M", "-Xmx1024M", "-XX:MaxPermSize=128M", "-jar", return Runtime.getRuntime().exec(new String[] { "java", "-Xms" + minmem, "-Xmx" + maxmem,
"spigot-" + SERVER_VERSION + ".jar" }); "-XX:MaxPermSize=128M", "-jar", "spigot-" + SERVER_VERSION + ".jar" });
} }
private static void sendMessage(PrintWriter output, String color, String text) { private static void sendMessage(PrintWriter output, String color, String text) {