Fixed bug in redis instance logging

Author: codemonstur

src/main/java/redis/embedded/RedisInstance.java

@@ -1,10 +1,7 @@
 package redis.embedded;
 
-import redis.embedded.util.CheckedRunnable;
-
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
@@ -43,25 +40,23 @@ public synchronized void start() throws IOException {
                 .directory(new File(args.get(0)).getParentFile())
                 .start();
             addShutdownHook("RedisInstanceCleaner", checkedToRuntime(this::stop));
-            final String startupLog = awaitServerReady(process, readyPattern);
-            if (soutListener != null) {
-                soutListener.accept(startupLog);
-                newDaemonThread(() -> logStream(process.getInputStream(), soutListener)).start();
-            }
             if (serrListener != null)
                 newDaemonThread(() -> logStream(process.getErrorStream(), serrListener)).start();
+            awaitServerReady(process, readyPattern, soutListener);
+            if (soutListener != null)
+                newDaemonThread(() -> logStream(process.getInputStream(), soutListener)).start();
 
             active = true;
         } catch (final IOException e) {
             throw new IOException("Failed to start Redis service", e);
         }
     }
 
-    private static String awaitServerReady(final Process process, final Pattern readyPattern) throws IOException {
+    private static void awaitServerReady(final Process process, final Pattern readyPattern,
+                                           final Consumer<String> soutListener) throws IOException {
         final StringBuilder log = new StringBuilder();
-        if (!findMatchInStream(process.getInputStream(), readyPattern, log))
+        if (!findMatchInStream(process.getInputStream(), readyPattern, soutListener, log))
             throw new IOException("Ready pattern not found in log. Startup log: " + log);
-        return log.toString();
     }
 
     public synchronized void stop() throws IOException {

src/main/java/redis/embedded/util/IO.java

@@ -58,10 +58,11 @@ public static Thread newDaemonThread(final Runnable run) {
         return thread;
     }
 
-    public static boolean findMatchInStream(final InputStream in, final Pattern pattern,
-                                            final StringBuilder processOutput) throws IOException {
+    public static boolean findMatchInStream(final InputStream in, final Pattern pattern
+            , final Consumer<String> soutListener, final StringBuilder processOutput) throws IOException {
         try (final BufferedReader reader = new BufferedReader(new InputStreamReader(in))) {
             String line; while ((line = reader.readLine()) != null) {
+                if (soutListener != null) soutListener.accept(line);
                 processOutput.append('\n').append(line);
                 if (pattern.matcher(line).matches())
                     return true;