Amélioration ProcessManager, infos démarrage...

Dabsunter · May 5, 2016 · 144e652 · 144e652
1 parent 816f456
commit 144e652
Show file tree

Hide file tree

Showing 5 changed files with 260 additions and 225 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,6 +1,6 @@
 name: OMGRemote
 main: fr.dabsunter.omgremote.Main
-version: 1.1.0
+version: 1.1.1
 description: Lanceur de serveur paralelle
 
 commands:

diff --git a/src/fr/dabsunter/omgremote/Main.java b/src/fr/dabsunter/omgremote/Main.java
@@ -30,6 +30,13 @@ public void onEnable() {
 		CommandListener.register("send", processCmd);
 		CommandListener.register("kill", processCmd);
 
+		getLogger().info(
+				"Running on " + System.getProperty("os.name") +
+				" v" + System.getProperty("os.version") +
+				" (" + System.getProperty("os.arch") +
+				") with Java " + System.getProperty("java.version")
+				);
+
 		ConfigurationSection servers = getConfig().getConfigurationSection("servers");
 		for(String key : servers.getKeys(false)) {
 			ConfigurationSection section = servers.getConfigurationSection(key);
@@ -44,6 +51,8 @@ public void onEnable() {
 				directory = new File(section.getString("folder"));
 			}
 			new ProcessManager(key, command, directory);
+			getServer().getConsoleSender().sendMessage(
+					"Successfully launched " + key + " process");
 		}
 	}
 

diff --git a/src/fr/dabsunter/omgremote/ProcessManager.java b/src/fr/dabsunter/omgremote/ProcessManager.java
@@ -1,113 +1,128 @@
-package fr.dabsunter.omgremote;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import fr.dabsunter.omgremote.commands.FileCommands;
-
-public class ProcessManager {
-
-	private static final Set<ProcessManager> managers = new HashSet<>();
-
-	public static ProcessManager get(String name) {
-		for(ProcessManager manager : managers)
-			if(manager.name.equals(name))
-				return manager;
-		return null;
-	}
-
-	public static void stopAll() {
-		for(ProcessManager manager : managers)
-			manager.stop();
-	}
-
-
-	private String name;
-	private Process process;
-
-	public ProcessManager(String name, List<String> command) {
-		this(name, command, FileCommands.current);
-	}
-
-	public ProcessManager(String name, List<String> command, File directory) {
-		this.name = name;
-
-		try {
-			File logs = new File("logs/remote-" + name + ".log");
-			if(!logs.exists())
-				logs.createNewFile();
-			process = new ProcessBuilder()
-			 .command(command)
-			 .directory(directory)
-			 .redirectErrorStream(true)
-			 .start();
-		} catch (IOException ex) {
-			System.out.println("Error while starting " + name + " process.");
-			ex.printStackTrace();
-			return;
-		}
-
-		new Thread() {
-			@SuppressWarnings("deprecation")
-			public void run() {
-				if(!process.isAlive())
-					stop();
-				try {
-					BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
-					String line = "";
-					try {
-						while((line = reader.readLine()) != null) {
-							BufferedWriter writer = new BufferedWriter(new FileWriter("logs/remote-" + name + ".log"));
-							writer.write(line);
-							writer.newLine();
-							writer.close();
-						}
-					} finally {
-						reader.close();
-					}
-				} catch(IOException ex) {
-					ex.printStackTrace();
-				}
-			}
-		}.start();;
-
-		managers.add(this);
-	}
-
-	public void write(String command) {
-		try {
-			BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream()));
-			try {
-				writer.write(command);
-				writer.newLine();
-			} finally {
-				writer.flush();
-			}
-		} catch(IOException ex) {
-			System.out.println("Error while writing \"" + command + "\" in OutputStream of " + name + " process.");
-			ex.printStackTrace();
-		}
-	}
-
-	public void stop() {
-		process.destroy();
-		try {
-			process.waitFor(10, TimeUnit.SECONDS);
-		} catch (InterruptedException ex) {
-			ex.printStackTrace();
-		}
-		if(process.isAlive())
-			process.destroyForcibly();
-		managers.remove(this);
-	}
-
-}
+package fr.dabsunter.omgremote;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import fr.dabsunter.omgremote.commands.FileCommands;
+
+public class ProcessManager {
+
+	private static final Set<ProcessManager> managers = new HashSet<>();
+	private static final Map<String, ProcessBuilder> builders = new HashMap<>();
+
+	public static ProcessManager get(String name) {
+		for(ProcessManager manager : managers)
+			if(manager.name.equals(name))
+				return manager;
+		return null;
+	}
+
+	public static void stopAll() {
+		for(ProcessManager manager : managers)
+			manager.stop();
+	}
+
+
+	private String name;
+	private Process process;
+
+	public ProcessManager(String name) throws NullPointerException {
+		if(builders.containsKey(name))
+			init(name);
+		else
+			throw new NullPointerException();
+	}
+
+	public ProcessManager(String name, List<String> command) {
+		this(name, command, FileCommands.current);
+	}
+
+	public ProcessManager(String name, List<String> command, File directory) {
+		builders.put(name, new ProcessBuilder()
+		 .command(command)
+		 .directory(directory)
+		 .redirectErrorStream(true));
+		init(name);
+	}
+
+	private void init(String name) {
+		this.name = name;
+
+		try {
+			File logs = new File("logs");
+			if(!logs.exists())
+				logs.mkdir();
+			logs = new File(logs, "remote-" + name + ".log");
+			if(!logs.exists())
+				logs.createNewFile();
+			this.process = builders.get(name).start();
+		} catch (IOException ex) {
+			System.out.println("Error while starting " + name + " process.");
+			ex.printStackTrace();
+			return;
+		}
+
+		new Thread() {
+			public void run() {
+				try {
+					BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
+					BufferedWriter writer = new BufferedWriter(new FileWriter("logs/remote-" + name + ".log"));
+					String line = "";
+					try {
+						while((line = reader.readLine()) != null) {
+							writer.write(line);
+							writer.newLine();
+							writer.flush();
+						}
+					} finally {
+						reader.close();
+						writer.close();
+					}
+				} catch(IOException ex) {
+					ex.printStackTrace();
+				}
+				managers.remove(ProcessManager.this);
+			}
+		}.start();;
+
+		managers.add(this);
+	}
+
+	public void write(String command) {
+		try {
+			BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream()));
+			try {
+				writer.write(command);
+				writer.newLine();
+			} finally {
+				writer.flush();
+			}
+		} catch(IOException ex) {
+			System.out.println("Error while writing \"" + command + "\" in OutputStream of " + name + " process.");
+			ex.printStackTrace();
+		}
+	}
+
+	public void stop() {
+		process.destroy();
+		try {
+			process.waitFor(10, TimeUnit.SECONDS);
+		} catch (InterruptedException ex) {
+			ex.printStackTrace();
+		}
+		if(process.isAlive())
+			process.destroyForcibly();
+	}
+
+}