Merge pull request #17 from zonkyio/process-logging

#16 Fix process logging

Author: tomix26

src/main/java/io/zonky/test/db/postgres/embedded/EmbeddedPostgres.java

@@ -257,6 +257,7 @@ private void startPostmaster() throws IOException
                 pgBin("pg_ctl"),
                 "-D", dataDirectory.getPath(),
                 "-o", createInitOptions().stream().collect(Collectors.joining(" ")),
+                "-w",
                 "start"
         ));
 
@@ -621,7 +622,7 @@ private void system(String... command)
                 ProcessOutputLogger.logOutput(LOG, process, processName);
             }
             if (0 != process.waitFor()) {
-                throw new IllegalStateException(String.format("Process %s failed%n%s", Arrays.asList(command), IOUtils.toString(process.getErrorStream())));
+                throw new IllegalStateException(String.format("Process %s failed", Arrays.asList(command)));
             }
         } catch (final RuntimeException e) { // NOPMD
             throw e;

src/main/java/io/zonky/test/db/postgres/embedded/ProcessOutputLogger.java

@@ -18,11 +18,11 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.UncheckedIOException;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Field;
 import java.nio.charset.StandardCharsets;
-import java.util.Optional;
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
@@ -38,25 +38,20 @@
 final class ProcessOutputLogger implements Runnable {
     @SuppressWarnings("PMD.LoggerIsNotStaticFinal")
     private final Logger logger;
-    private final Process process;
     private final BufferedReader reader;
 
     private ProcessOutputLogger(final Logger logger, final Process process) {
         this.logger = logger;
-        this.process = process;
-        reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8));
+        this.reader = new BufferedReader(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8));
     }
 
     @Override
     public void run() {
         try {
-            while (process.isAlive()) {
-                try {
-                    Optional.ofNullable(reader.readLine()).ifPresent(logger::info);
-                } catch (final IOException e) {
-                    logger.error("while reading output", e);
-                    return;
-                }
+            try {
+                reader.lines().forEach(logger::info);
+            } catch (final UncheckedIOException e) {
+                logger.error("while reading output", e);
             }
         } finally {
             try {