Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

379207 backported fixes from jetty-9 to make hierarchy work

This commit is contained in:
Greg Wilkins 2012-07-27 09:24:25 +10:00
parent 748f06cad7
commit c7c4c6e13b
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
View File

@ -331,8 +331,8 @@ public class StdErrLog extends AbstractLogger
this._level = LEVEL_DEBUG; this._level = LEVEL_DEBUG;
for (Logger log : Log.getLoggers().values()) for (Logger log : Log.getLoggers().values())
{ {
if (log instanceof StdErrLog) if (log.getName().startsWith(getName()) && log instanceof StdErrLog)
((StdErrLog)log).setLevel(LEVEL_DEBUG); ((StdErrLog)log).setLevel(LEVEL_DEBUG);
} }
} }
@ -342,7 +342,7 @@ public class StdErrLog extends AbstractLogger
for (Logger log : Log.getLoggers().values()) for (Logger log : Log.getLoggers().values())
{ {
if (log instanceof StdErrLog) if (log.getName().startsWith(getName()) && log instanceof StdErrLog)
((StdErrLog)log).setLevel(((StdErrLog)log)._configuredLevel); ((StdErrLog)log).setLevel(((StdErrLog)log)._configuredLevel);
} }
} }
@ -572,6 +572,10 @@ public class StdErrLog extends AbstractLogger
// Let Level come from configured Properties instead - sel.setLevel(_level); // Let Level come from configured Properties instead - sel.setLevel(_level);
logger.setSource(_source); logger.setSource(_source);
logger._stderr = this._stderr; logger._stderr = this._stderr;
// Force the child to have any programmatic configuration
if (_level!=_configuredLevel)
logger._level=_level;
return logger; return logger;
} }

14
jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
View File

@ -69,18 +69,28 @@ public class StdErrLogTest
log.debug("YOU SHOULD NOT SEE THIS!",null,null); log.debug("YOU SHOULD NOT SEE THIS!",null,null);
// Test for backward compat with old (now deprecated) method // Test for backward compat with old (now deprecated) method
Logger before = log.getLogger("before");
log.setDebugEnabled(true); log.setDebugEnabled(true);
Logger after = log.getLogger("after");
before.debug("testing {} {}","test","debug-before");
log.debug("testing {} {}","test","debug-deprecated"); log.debug("testing {} {}","test","debug-deprecated");
after.debug("testing {} {}","test","debug-after");
log.setDebugEnabled(false); log.setDebugEnabled(false);
before.debug("testing {} {}","test","debug-before-false");
log.debug("testing {} {}","test","debug-deprecated-false"); log.debug("testing {} {}","test","debug-deprecated-false");
after.debug("testing {} {}","test","debug-after-false");
output.assertContains("DBUG:xxx:testing test debug"); output.assertContains("DBUG:xxx:testing test debug");
output.assertContains("INFO:xxx:testing test info"); output.assertContains("INFO:xxx:testing test info");
output.assertContains("WARN:xxx:testing test warn"); output.assertContains("WARN:xxx:testing test warn");
output.assertNotContains("YOU SHOULD NOT SEE THIS!"); output.assertNotContains("YOU SHOULD NOT SEE THIS!");
output.assertContains("DBUG:x.before:testing test debug-before");
output.assertContains("DBUG:xxx:testing test debug-deprecated"); output.assertContains("DBUG:xxx:testing test debug-deprecated");
output.assertNotContains("DBUG:xxx:testing test debug-depdeprecated-false"); output.assertContains("DBUG:x.after:testing test debug-after");
output.assertNotContains("DBUG:x.before:testing test debug-before-false");
output.assertNotContains("DBUG:xxx:testing test debug-deprecated-false");
output.assertNotContains("DBUG:x.after:testing test debug-after-false");
} }
@Test @Test