fix: redirected process outputs to logs

bekoenig · Aug 3, 2024 · 9406e05 · 9406e05
1 parent b0020ee
commit 9406e05
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/launcher/src/main/java/io/github/bekoenig/getdown/launcher/Getdown.java b/launcher/src/main/java/io/github/bekoenig/getdown/launcher/Getdown.java
@@ -13,6 +13,7 @@
 import io.github.bekoenig.getdown.util.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
@@ -27,6 +28,8 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
+import static java.util.stream.Collectors.joining;
+
 /**
  * Manages the main control for the Getdown application updater and deployment system.
  */
@@ -761,7 +764,7 @@ protected void launch() {
 
                 // spawn a daemon thread that will catch the early bits of stderr in case the
                 // launch fails
-                Thread t = new Thread(() -> copyStream(stderr, System.err));
+                Thread t = new Thread(() -> logStream(stderr, Level.ERROR));
                 t.setDaemon(true);
                 t.start();
             }
@@ -1024,22 +1027,22 @@ protected boolean invokeDirect() {
     protected abstract void exit(int exitCode);
 
     /**
-     * Copies the supplied stream from the specified input to the specified output. Used to copy
-     * our child processes stderr and stdout to our own stderr and stdout.
+     * Logs the supplied stream from the specified input at level.
      */
-    protected static void copyStream(InputStream in, PrintStream out) {
+    protected static void logStream(InputStream in, Level level) {
         try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                out.print(line);
-                out.flush();
+            String result = new BufferedReader(new InputStreamReader(in))
+                .lines().collect(joining(System.lineSeparator()));
+
+            if (!result.isEmpty()) {
+                LOGGER.atLevel(level)
+                    .setMessage(result)
+                    .log();
             }
-        } catch (IOException ioe) {
+        } catch (UncheckedIOException ioe) {
             LOGGER.atWarn()
                 .setMessage("Failure copying")
                 .addKeyValue("in", in)
-                .addKeyValue("out", out)
                 .addKeyValue("error", ioe)
                 .log();
         }