[FIXED JENKINS-18959] /log/all should not show FINE messages from cus…

…tom loggers.
jenkinsci · Jul 26, 2013 · 010d9e9 · 010d9e9
1 parent 2210ec1
commit 010d9e9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -84,6 +84,9 @@
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17302">issue 17302</a>)
   <li class=rfe>
     Clearer display of log messages: chronological order, and coloration of repeated vs. fresh metadata (date, log level, log source).
+  <li class=bug>
+    Ensuring <code>/log/all</code> shows only <code>INFO</code> and above messages, even if custom loggers display <code>FINE</code> or below.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18959">issue 18959</a>)
   <li class=bug>
     Fixed a regression that broke some plugins' form validation
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18776">issue 18776</a>)

diff --git a/core/src/main/java/hudson/WebAppMain.java b/core/src/main/java/hudson/WebAppMain.java
@@ -59,14 +59,21 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.security.Security;
+import java.util.logging.LogRecord;
 
 /**
  * Entry point when Hudson is used as a webapp.
  *
  * @author Kohsuke Kawaguchi
  */
 public final class WebAppMain implements ServletContextListener {
-    private final RingBufferLogHandler handler = new RingBufferLogHandler();
+    private final RingBufferLogHandler handler = new RingBufferLogHandler() {
+        @Override public synchronized void publish(LogRecord record) {
+            if (record.getLevel().intValue() >= Level.INFO.intValue()) {
+                super.publish(record);
+            }
+        }
+    };
     private static final String APP = "app";
     private boolean terminated;
     private Thread initThread;