358649 - StdErrLog system properties for package/class logging LEVEL.

+ Fixing LogTest for deprecations in StdErrLog.setDebugEnabled()

2 files changed, 20 insertions, 5 deletions

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
index e583f13548..13bbbee97c 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
@@ -304,7 +304,14 @@ public class StdErrLog implements Logger
     @Deprecated
     public void setDebugEnabled(boolean enabled)
     {
-        _level = LEVEL_DEBUG;
+        if (enabled)
+        {
+            _level = LEVEL_DEBUG;
+        }
+        else
+        {
+            _level = LEVEL_INFO;
+        }
     }
 
     public int getLevel()
diff --git a/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java b/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
index 3495cffb99..d4b90db6e0 100644
--- a/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
+++ b/jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
@@ -101,12 +101,13 @@ public class LogTest
         logContains("INFO:oejul.LogTest:testing");
     }
 
+    @SuppressWarnings("deprecation")
     @Test
     public void testStdErrLogDebug()
     {
         StdErrLog log = new StdErrLog("xxx");
         
-        log.setDebugEnabled(true);
+        log.setLevel(StdErrLog.LEVEL_DEBUG);
         log.debug("testing {} {}","test","debug");
         logContains("DBUG:xxx:testing test debug");
         
@@ -116,9 +117,18 @@ public class LogTest
         log.warn("testing {} {}","test","warn");
         logContains("WARN:xxx:testing test warn");
         
-        log.setDebugEnabled(false);
+        log.setLevel(StdErrLog.LEVEL_INFO);
         log.debug("YOU SHOULD NOT SEE THIS!",null,null);
         logNotContains("YOU SHOULD NOT SEE THIS!");
+        
+        // Test for backward compat with old (now deprecated) method
+        log.setDebugEnabled(true);
+        log.debug("testing {} {}","test","debug-deprecated");
+        logContains("DBUG:xxx:testing test debug-deprecated");
+
+        log.setDebugEnabled(false);
+        log.debug("testing {} {}","test","debug-deprecated-false");
+        logNotContains("DBUG:xxx:testing test debug-depdeprecated-false");
     }
     
     @Test
@@ -134,7 +144,6 @@ public class LogTest
         
         next.info("testing {} {}","next","info");
         logContains(":test.next:testing next info");
-        
     }
     
     @Test
@@ -164,6 +173,5 @@ public class LogTest
         logContains("Message with ? escape");
         log.info(th.toString());
         logContains("Message with ? escape");
-        
     }
 }