Merge pull request #187 from McRuben/localwrapper-console

Use ExecutorService for the local wrappers console

Author: GiantTreeLP

cloudnet-core/src/main/java/de/dytanic/cloudnetcore/wrapper/local/LocalCloudWrapper.java

@@ -28,6 +28,8 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.Collections;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
@@ -39,9 +41,7 @@ public class LocalCloudWrapper implements Runnabled<OptionSet>, Closeable {
     private static final String WRAPPER_URL = "https://ci.cloudnetservice.eu/job/CloudNetService/job/CloudNet/job/master/lastSuccessfulBuild/artifact/cloudnet-wrapper/target/CloudNet-Wrapper.jar";
 
     private Process process;
-    private Thread consoleThread;
-    private StringBuffer stringBuffer = new StringBuffer();
-    private byte[] buffer = new byte[1024];
+    private ExecutorService executorService = Executors.newFixedThreadPool(2);
     private boolean shutdown = false;
     private boolean enabled;
     private boolean showConsoleOutput = !Boolean.getBoolean("cloudnet.localwrapper.disableConsole");
@@ -68,8 +68,8 @@ public Configuration loadWrapperConfiguration() {
         if (this.config == null || this.config.isOutdated()) {
             try (InputStream inputStream = Files.newInputStream(Paths.get("wrapper/config.yml"))) {
                 this.config = new LocalWrapperConfig(ConfigurationProvider.getProvider(YamlConfiguration.class).load(inputStream));
-            } catch (IOException e) {
-                e.printStackTrace();
+            } catch (IOException exception) {
+                exception.printStackTrace();
             }
         }
         return this.config != null ? this.config.getConfiguration() : null;
@@ -78,7 +78,24 @@ public Configuration loadWrapperConfiguration() {
     public void installUpdate(WebClient webClient) {
         Path path = Paths.get("wrapper/CloudNet-Wrapper.jar");
         if (Files.exists(path)) {
+            boolean runningBeforeUpdate = false;
+            if (this.process != null && this.process.isAlive()) {
+                this.shutdown = true;
+                try {
+                    this.stop();
+                    runningBeforeUpdate = true;
+                } catch (IOException exception) {
+                    exception.printStackTrace();
+                }
+            }
             webClient.updateLocalCloudWrapper(path);
+            if (runningBeforeUpdate) {
+                try {
+                    this.startProcess();
+                } catch (IOException exception) {
+                    exception.printStackTrace();
+                }
+            }
         }
     }
 
@@ -95,8 +112,8 @@ public void run(OptionSet obj) {
                 this.setupWrapperKey();
                 this.setupSpigot(obj);
 
-            } catch (IOException e) {
-                e.printStackTrace();
+            } catch (IOException exception) {
+                exception.printStackTrace();
             }
 
             this.startup();
@@ -117,8 +134,8 @@ private void setupWrapperJar() {
                 urlConnection.connect();
                 Files.copy(urlConnection.getInputStream(), path);
                 System.out.println("Download completed!");
-            } catch (Exception ex) {
-                System.err.println("Error on setting up wrapper: " + ex.getMessage());
+            } catch (Exception exception) {
+                System.err.println("Error on setting up wrapper: " + exception.getMessage());
                 return;
             }
         }
@@ -179,17 +196,17 @@ private void setupConfig() {
 
             try (OutputStreamWriter outputStreamWriter = new OutputStreamWriter(Files.newOutputStream(path), StandardCharsets.UTF_8)) {
                 ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, outputStreamWriter);
-            } catch (IOException e) {
-                e.printStackTrace();
+            } catch (IOException exception) {
+                exception.printStackTrace();
             }
         }
     }
 
     private void setupWrapperKey() {
         try {
             Files.copy(Paths.get("WRAPPER_KEY.cnd"), Paths.get("wrapper/WRAPPER_KEY.cnd"), StandardCopyOption.REPLACE_EXISTING);
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (IOException exception) {
+            exception.printStackTrace();
         }
     }
 
@@ -198,8 +215,8 @@ private void setupSpigot(OptionSet obj) {
         if (!obj.has("disallow_bukkit_download") && !Files.exists(path)) {
             try {
                 Files.createDirectories(path.getParent());
-            } catch (IOException e) {
-                e.printStackTrace();
+            } catch (IOException exception) {
+                exception.printStackTrace();
             }
             SetupSpigotVersion setup = new SetupSpigotVersion();
             setup.setTarget(path);
@@ -215,12 +232,11 @@ private void startup() {
         System.out.println("Starting local wrapper...");
         try {
             this.startProcess();
-            this.initConsoleThread();
 
             System.out.println("Successfully started the local wrapper!");
-        } catch (IOException e) {
+        } catch (IOException exception) {
             System.err.println("Failed to start the local wrapper!");
-            e.printStackTrace();
+            exception.printStackTrace();
         }
     }
 
@@ -232,62 +248,48 @@ private void startProcess() throws IOException {
                                           "-Dcloudnet.logging.prompt.disabled=true",
                                           "-jar",
                                           "CloudNet-Wrapper.jar").directory(new File("wrapper")).start();
+        this.initConsoleThread();
         System.out.println("Successfully started the wrapper process!");
     }
 
     private void initConsoleThread() {
-        this.consoleThread = new Thread(() -> {
-            while (!Thread.interrupted()) {
-                if (this.process.isAlive()) {
-                    this.readStream(this.process.getInputStream(), s -> {
-                        if (this.showConsoleOutput) {
-                            System.out.println("LocalWrapper | " + s);
-                        }
-                    });
-                    this.readStream(this.process.getErrorStream(), s -> {
-                        if (this.showConsoleOutput) {
-                            System.err.println("LocalWrapper | " + s);
-                        }
-                    });
-                } else if (!shutdown) {
-                    try {
-                        this.startProcess();
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    this.enabled = false;
-                    Thread.currentThread().interrupt();
+        this.executorService.execute(() -> {
+            InputStream inputStream = this.process.getInputStream();
+            this.readStream(inputStream, line -> {
+                if (this.showConsoleOutput) {
+                    System.out.println("LocalWrapper | " + line);
                 }
+            });
+            if (!this.shutdown) {
+                try {
+                    this.startProcess();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                this.enabled = false;
             }
-        }, "LocalWrapper-Console");
-        this.consoleThread.start();
+        });
+        this.executorService.execute(() -> {
+            InputStream inputStream = this.process.getErrorStream();
+            this.readStream(inputStream, line -> {
+                if (this.showConsoleOutput) {
+                    System.err.println("LocalWrapper | " + line);
+                }
+            });
+        });
     }
 
     private void readStream(InputStream inputStream, Consumer<String> consumer) {
-        try {
-            int len;
-            while (inputStream.available() > 0 && (len = inputStream.read(this.buffer)) != -1) {
-                this.stringBuffer.append(new String(this.buffer, 0, len, StandardCharsets.UTF_8));
-            }
-
-            String stringText = this.stringBuffer.toString();
-            if (!stringText.contains("\n") && !stringText.contains("\r")) {
-                return;
-            }
-
-            for (String input : stringText.split("\r")) {
-                for (String text : input.split("\n")) {
-                    if (!text.trim().isEmpty()) {
-                        consumer.accept(text);
-                    }
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))){
+            String line;
+            while ((line = reader.readLine()) != null) {
+                if (!line.isEmpty()) {
+                    consumer.accept(line);
                 }
             }
-
-            this.stringBuffer.setLength(0);
-
-        } catch (Exception ignored) {
-            this.stringBuffer.setLength(0);
+        } catch (IOException exception) {
+            exception.printStackTrace();
         }
     }
 
@@ -308,8 +310,8 @@ private void stop() throws IOException {
                 this.process.destroy();
             }
             System.out.println("Successfully stopped the local wrapper!");
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        } catch (InterruptedException exception) {
+            exception.printStackTrace();
         }
     }