Added tempfile, so minecartd -S would work even if port= changes in config.

This allows for the `systemd` service to be `restart`ed after a config edit
(instead of having to `stop` service, edit cfg and then `start` again)

Author: bence98

src/main/csokicraft/minecartd/MineCartD.java

@@ -6,33 +6,40 @@
 import csokicraft.minecartd.manager.MineManagerHost;
 
 public class MineCartD{
+	public static final String APP_NAME_VER="MineCartD v1.1"; 
 
 	public static void main(String[] args) throws IOException{
 		if(args.length>0&&("--help".equals(args[0])||"-h".equals(args[0]))){
 			displayHelp();
 			System.exit(0);
 		}
 
-		System.out.println("Loading MineCartD v1.0, by CsokiCraft");
+		System.out.println("Loading "+APP_NAME_VER+", by CsokiCraft");
 		boolean discover=true, stop=false;
-		String cfg=null;
+		String cfg=null, tmpf=null;
 		for(int i=0;i<args.length;i++){
 			if("--gen-cfg".equals(args[i])||"-C".equals(args[i]))
 				discover=false;
 			if("--cfgfile".equals(args[i])||"-f".equals(args[i]))
 				cfg=args[++i];
 			if("--stop".equals(args[i])||"-S".equals(args[i]))
 				stop=true;
+			if("--tmpfile".equals(args[i])||"-t".equals(args[i]))
+				tmpf=args[++i];
 		}
 
 		MineConfigHandler cfgMan;
 		if(cfg==null)
 			cfgMan=new MineConfigHandler();
 		else
 			cfgMan=new MineConfigHandler(new File(cfg));
+		if(tmpf!=null)
+			cfgMan.setTempFile(tmpf);
 
 		if(stop){
-			Socket sock=new Socket("localhost", cfgMan.port);
+			int port=cfgMan.lastPort;
+			if(port==-1) port=cfgMan.port;
+			Socket sock=new Socket("localhost", port);
 			PrintWriter out=new PrintWriter(sock.getOutputStream());
 			out.println("STOP");
 			out.flush();
@@ -41,6 +48,7 @@ public static void main(String[] args) throws IOException{
 			MineManagerHost host=new MineManagerHost(cfgMan);
 			while(host.isAlive())
 				Thread.yield();
+			cfgMan.onServerStop();
 		}
 	}
 

src/main/csokicraft/minecartd/MineConfigHandler.java

@@ -10,11 +10,20 @@ public class MineConfigHandler{
 								DEFAULT_DIR="/var/lib/minecartd/servers";
 	public static final int DEFAULT_PORT=40960;
 
+	/** Config file */
 	protected File cfgFile;
 
+	/** Config entry: Servers' directory */
 	public File serversDir;
+	/** Config entry: The port of the server */
 	public int port;
 
+	/** Temp file */
+	protected File tmpFile;
+	
+	/** Tempfile entry: last known port of the server. '-1' means unknown */
+	protected int lastPort=-1;
+	
 	public MineConfigHandler() throws IOException{
 		this(new File(DEFAULT_CFG));
 	}
@@ -25,7 +34,7 @@ protected MineConfigHandler(File file) throws IOException{
 	}
 
 	private void genCfg() throws IOException{
-		System.out.println("Creating config at "+cfgFile.getAbsolutePath());
+		System.out.println("Creating config...");
 		PrintWriter fout=new PrintWriter(cfgFile);
 		fout.println("# This is the default config for MineCartD");
 		fout.println();
@@ -36,7 +45,7 @@ private void genCfg() throws IOException{
 	}
 
 	private void readCfg() throws IOException{
-		System.out.println("Reading config at "+cfgFile.getAbsolutePath());
+		System.out.println("Config at "+cfgFile.getAbsolutePath());
 		if(!cfgFile.exists())
 			genCfg();
 		if(!cfgFile.canRead())
@@ -74,4 +83,33 @@ public List<MineCraftServer> discoverServers(){
 		System.out.println("Found "+servers.size()+" servers");
 		return servers;
 	}
+
+	public void setTempFile(String tmp) throws IOException{
+		tmpFile=new File(tmp);
+		if(!tmpFile.exists()) return;
+		BufferedReader in=new BufferedReader(new FileReader(tmpFile));
+		String ln=in.readLine();
+		while(ln!=null){
+			if(ln.startsWith("port="))
+				lastPort=Integer.parseInt(ln.substring(5));
+			else System.err.println("Temp file has invalid line: "+ln);
+			ln=in.readLine();
+		}
+		in.close();
+	}
+	
+	public void onServerStart() throws IOException{
+		if(tmpFile!=null){
+			PrintWriter out=new PrintWriter(tmpFile);
+			out.println("port="+port);
+			out.close();
+		}
+	}
+	
+	public void onServerStop(){
+		if(tmpFile!=null){
+			tmpFile.delete();
+			lastPort=-1;
+		}
+	}
 }

src/main/csokicraft/minecartd/manager/MineManagerHost.java

@@ -27,6 +27,7 @@ public MineManagerHost(List<MineCraftServer> l, int port) throws IOException{
 
 	public MineManagerHost(MineConfigHandler cfg) throws IOException{
 		this(cfg.discoverServers(), cfg.port);
+		cfg.onServerStart();
 	}
 
 	public synchronized void newWorker() throws IOException{

src/main/csokicraft/minecartd/manager/MineManagerWorker.java

@@ -3,6 +3,8 @@
 import java.io.*;
 import java.net.*;
 
+import csokicraft.minecartd.MineCartD;
+
 public class MineManagerWorker extends Thread{
 	protected MineManagerHost host;
 
@@ -20,7 +22,7 @@ public void run(){
 			host.newWorker();
 			BufferedReader in=new BufferedReader(new InputStreamReader(sock.getInputStream()));
 			PrintWriter out=new PrintWriter(sock.getOutputStream());
-			out.println("MineCartD v1.0 Command Interface. Type 'help' for a list of commands");
+			out.println(MineCartD.APP_NAME_VER+" Command Interface. Type 'help' for a list of commands");
 			out.flush();
 			String cmd=in.readLine();
 			while(cmd!=null){

src/rsrc/minecartd_install

@@ -5,16 +5,21 @@ if [ $(id -u) != 0 ]; then
     exit 1
 fi
 
+# If minecartd service is installed, first stop it
+if [ -s /etc/systemd/system/minecartd.service ]; then
+	systemctl stop minecartd
+fi
+
 # Add user and working directory
 useradd -U -r -d /var/lib/minecartd -m minecartd
 
 # Download JAR
-wget -O /usr/lib/minecartd.jar http://csokicraft.agyklub.hu/downloads?file=minecartd_1.0.jar
+wget -O /usr/lib/minecartd.jar http://csokicraft.agyklub.hu/downloads?file=minecartd_1.1.jar
 
 # Add runscript
 cat > /usr/bin/minecartd <<'EOF'
 #!/bin/sh
-java -jar /usr/lib/minecartd.jar "$@"
+java -jar /usr/lib/minecartd.jar -t ~/minecartd.tmp "$@"
 EOF
 chmod 655 /usr/bin/minecartd