QPID-3501: LogMonitor duplicates chunks of log file if it fails to find match. Avoid busy-wait in LogMonitor whilst polling log file. Make QpidBrokerTestCase use a autoflushing PrintStream for writing broker messages to log (client side messages were already autoflushed as this is a default behaviour of the log4j Appender).

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1174648 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 23 insertions, 28 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
index f56f428f0b..484c2afeb5 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
@@ -349,7 +349,7 @@ public class AbstractTestLogging extends QpidBrokerTestCase
 
     public boolean waitForMessage(String message, long wait) throws FileNotFoundException, IOException
     {
-        return _monitor.waitForMessage(message, wait, true);
+        return _monitor.waitForMessage(message, wait);
     }
 
     /**
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 455a208a3f..7b59b3283a 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -52,7 +52,6 @@ import javax.naming.NamingException;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.qpid.AMQException;
 import org.apache.qpid.client.AMQConnectionFactory;
@@ -217,7 +216,7 @@ public class QpidBrokerTestCase extends QpidTestCase
         if (redirected)
         {
             _outputFile = new File(String.format("%s/TEST-%s.out", _output, qname));
-            out = new PrintStream(_outputFile);
+            out = new PrintStream(new FileOutputStream(_outputFile), true);
             err = new PrintStream(String.format("%s/TEST-%s.err", _output, qname));
 
             // This is relying on behaviour specific to log4j 1.2.12.   If we were to upgrade to 1.2.13 or
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
index 3b0033f2e2..c09e63308c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitor.java
@@ -30,7 +30,6 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.LineNumberReader;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.LinkedList;
 
@@ -44,10 +43,10 @@ import java.util.LinkedList;
 public class LogMonitor
 {
     // The file that the log statements will be written to.
-    private File _logfile;
+    private final File _logfile;
 
     // The appender we added to the get messages
-    private FileAppender _appender;
+    private final FileAppender _appender;
 
     private int _linesToSkip = 0;
 
@@ -79,6 +78,7 @@ public class LogMonitor
         if (file != null && file.exists())
         {
             _logfile = file;
+            _appender = null;
         }
         else
         {
@@ -100,13 +100,13 @@ public class LogMonitor
      * @param wait    the time in ms to wait for the message to occur
      * @return true if the message was found
      *
-     * @throws java.io.FileNotFoundException if the Log file can nolonger be found
+     * @throws java.io.FileNotFoundException if the Log file can no longer be found
      * @throws IOException                   thrown when reading the log file
      */
     public List<String> waitAndFindMatches(String message, long wait)
             throws FileNotFoundException, IOException
     {
-        if (waitForMessage(message, wait, true))
+        if (waitForMessage(message, wait))
         {
             return findMatches(message);
         }
@@ -163,15 +163,12 @@ public class LogMonitor
      *
      * @param message the message to wait for in the log
      * @param wait    the time in ms to wait for the message to occur
-     *
-     * @param printFileOnFailure should we print the contents that have been
-     * read if we fail to find the message.
      * @return true if the message was found
      *
-     * @throws java.io.FileNotFoundException if the Log file can nolonger be found
+     * @throws java.io.FileNotFoundException if the Log file can no longer be found
      * @throws IOException                   thrown when reading the log file
      */
-    public boolean waitForMessage(String message, long wait, boolean printFileOnFailure)
+    public boolean waitForMessage(String message, long wait)
             throws FileNotFoundException, IOException
     {
         // Loop through alerts until we're done or wait ms seconds have passed,
@@ -183,28 +180,32 @@ public class LogMonitor
 
             boolean found = false;
             long endtime = System.currentTimeMillis() + wait;
-            ArrayList<String> contents = new ArrayList<String>();
             while (!found && System.currentTimeMillis() < endtime)
             {
-                while (reader.ready())
+                boolean ready = true;
+                while (ready = reader.ready())
                 {
                     String line = reader.readLine();
 
                     if (reader.getLineNumber() > _linesToSkip)
                     {
-                        contents.add(line);
                         if (line.contains(message))
                         {
                             found = true;
+                            break;
                         }
                     }
                 }
-            }
-            if (!found && printFileOnFailure)
-            {
-                for (String line : contents)
+                if (!ready)
                 {
-                    System.out.println(line);
+                    try
+                    {
+                        Thread.sleep(50);
+                    }
+                    catch (InterruptedException ie)
+                    {
+                        Thread.currentThread().interrupt();
+                    }
                 }
             }
             return found;
@@ -219,17 +220,12 @@ public class LogMonitor
         }
     }
     
-    public boolean waitForMessage(String message, long alertLogWaitPeriod) throws FileNotFoundException, IOException
-    {
-       return waitForMessage(message, alertLogWaitPeriod, true);
-    }
-
     /**
      * Read the log file in to memory as a String
      *
      * @return the current contents of the log file
      *
-     * @throws java.io.FileNotFoundException if the Log file can nolonger be found
+     * @throws java.io.FileNotFoundException if the Log file can no longer be found
      * @throws IOException                   thrown when reading the log file
      */
     public String readFile() throws FileNotFoundException, IOException
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
index 032853db67..89f707fbef 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/util/LogMonitorTest.java
@@ -168,7 +168,7 @@ public class LogMonitorTest extends TestCase
 
         // Verify that we can time out waiting for a message
         assertFalse("Message was logged ",
-                    _monitor.waitForMessage(message, TIME_OUT / 2, false));
+                    _monitor.waitForMessage(message, TIME_OUT / 2));
 
         // Verify that the message did eventually get logged.
         assertTrue("Message was never logged.",