From 4bf68f1a984c5719af92b4932fad6d2dc3fbacfe Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 1 Jan 2009 00:50:46 +0000
Subject: [PATCH] Logger configuration wasn't working since 1.267.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@14072 71c3de6d-444a-0410-be80-ed276b4c234a
---
 .../hudson/logging/LogRecorderManager.java    | 15 ++++++++++
 core/src/main/java/hudson/model/Hudson.java   | 14 ---------
 .../logging/LogRecorderManagerTest.java       | 30 +++++++++++++++++++
 3 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 test/src/test/java/hudson/logging/LogRecorderManagerTest.java

diff --git a/core/src/main/java/hudson/logging/LogRecorderManager.java b/core/src/main/java/hudson/logging/LogRecorderManager.java
index 23c986341f..133071eb24 100644
--- a/core/src/main/java/hudson/logging/LogRecorderManager.java
+++ b/core/src/main/java/hudson/logging/LogRecorderManager.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 
 /**
  * Owner of {@link LogRecorder}s, bound to "/log".
@@ -86,6 +87,20 @@ public class LogRecorderManager extends AbstractModelObject {
         rsp.sendRedirect2(name+"/configure");
     }
 
+    /**
+     * Configure the logging level.
+     */
+    public void doConfigLogger(StaplerResponse rsp, @QueryParameter String name, @QueryParameter String level) throws IOException {
+        Hudson.getInstance().checkPermission(Hudson.ADMINISTER);
+        Level lv;
+        if(level.equals("inherit"))
+            lv = null;
+        else
+            lv = Level.parse(level.toUpperCase());
+        Logger.getLogger(name).setLevel(lv);
+        rsp.sendRedirect2("all");
+    }
+
     /**
      * RSS feed for log entries.
      */
diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java
index 4ad7f4f135..26e128aa45 100644
--- a/core/src/main/java/hudson/model/Hudson.java
+++ b/core/src/main/java/hudson/model/Hudson.java
@@ -2171,20 +2171,6 @@ public final class Hudson extends AbstractModelObject implements ItemGroup<TopLe
         return a;
     }
 
-    /**
-     * Configure the logging level.
-     */
-    public void doConfigLogger(StaplerResponse rsp, @QueryParameter String name, @QueryParameter String level) throws IOException {
-        checkPermission(ADMINISTER);
-        Level lv;
-        if(level.equals("inherit"))
-            lv = null;
-        else
-            lv = Level.parse(level.toUpperCase());
-        Logger.getLogger(name).setLevel(lv);
-        rsp.sendRedirect2("log");
-    }
-
     /**
      * For system diagnostics.
      * Run arbitrary Groovy script.
diff --git a/test/src/test/java/hudson/logging/LogRecorderManagerTest.java b/test/src/test/java/hudson/logging/LogRecorderManagerTest.java
new file mode 100644
index 0000000000..5ce36922a4
--- /dev/null
+++ b/test/src/test/java/hudson/logging/LogRecorderManagerTest.java
@@ -0,0 +1,30 @@
+package hudson.logging;
+
+import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.Url;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+
+import java.util.logging.Logger;
+import java.util.logging.Level;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class LogRecorderManagerTest extends HudsonTestCase {
+    /**
+     * Makes sure that the logger configuration works.
+     */
+    @Url("http://d.hatena.ne.jp/ssogabe/20090101/1230744150")
+    public void testLoggerConfig() throws Exception {
+        Logger logger = Logger.getLogger("foo.bar.zot");
+
+        HtmlPage page = new WebClient().goTo("log/all");
+        HtmlForm form = page.getFormByName("configLogger");
+        form.getInputByName("name").setValueAttribute("foo.bar.zot");
+        form.getSelectByName("level").getOptionByValue("finest").setSelected(true);
+        submit(form);
+
+        assertEquals(logger.getLevel(), Level.FINEST);
+    }
+}
-- 
GitLab