Merge branch 'JENKINS-22839' of github.com:daniel-beck/jenkins

core/src/main/java/hudson/logging/LogRecorder.java

@@ -297,6 +297,12 @@ public class LogRecorder extends AbstractModelObject implements Saveable {
         rsp.sendRedirect2(redirect);
     }
 
+    @RequirePOST
+    public void doClear(StaplerRequest req, StaplerResponse rsp) throws IOException {
+        handler.clear();
+        rsp.sendRedirect2(".");
+    }
+
     /**
      * Loads the settings from a file.
      */

core/src/main/java/hudson/util/RingBufferLogHandler.java

@@ -59,6 +59,11 @@ public class RingBufferLogHandler extends Handler {
         }
     }
 
+    public synchronized void clear() {
+        size = 0;
+        start = 0;
+    }
+
     /**
      * Returns the list view of {@link LogRecord}s in the ring buffer.
      *

core/src/main/resources/hudson/logging/LogRecorder/index.jelly

@@ -37,6 +37,10 @@ THE SOFTWARE.
       <t:logRecords logRecords="${entry.value}"/>
     </j:forEach>
 
+    <form method="post" id='clear-logrecorder' action="clear">
+      <f:submit value="${%Clear This Log}" />
+    </form>
+
     <st:include it="${it.parent}" page="feeds.jelly" />    
   </l:main-panel>
 </l:layout>

core/src/test/java/hudson/logging/LogRecorderTest.java

@@ -54,6 +54,21 @@ public class LogRecorderTest {
         assertFalse(matches("", "hudson.model.Hudson", Level.FINE));
     }
 
+    @Test public void testClearing() {
+        LogRecorder lr = new LogRecorder("foo");
+        LogRecorder.Target t = new LogRecorder.Target("", Level.FINE);
+        lr.targets.add(t);
+
+        LogRecord record = createLogRecord("jenkins", Level.INFO, "message");
+        lr.handler.publish(record);
+        assertEquals(lr.handler.getView().get(0), record);
+        assertTrue(lr.handler.getView().size() == 1);
+
+        lr.handler.clear();
+
+        assertTrue(lr.handler.getView().size() == 0);
+    }
+
     @Test public void testSpecificExclusion() {
         LogRecorder lr = new LogRecorder("foo");