July 2006 - logback-dev - mailman3.qos.ch

svn commit: r278 - logback/classic/trunk/src/test/java/ch/qos/logback/classic/control
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:42:24 2006 New Revision: 278 Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java Log: Type Safety Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java ============================================================================== --- logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java (original) +++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java Tue Jul 25 14:42:24 2006 @@ -39,7 +39,7 @@ static public Scenario makeTypeBScenario(int len) { Scenario scenario = new Scenario(); - LinkedList queue = new LinkedList(); + LinkedList<String> queue = new LinkedList<String>(); int loggerCreationCount = 0; // add an empty string to get going

1 0

svn commit: r277 - logback/core/trunk/src/main/java/ch/qos/logback/core/joran/spi
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:41:56 2006 New Revision: 277 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java Log: Type Safety Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/joran/spi/Pattern.java Tue Jul 25 14:41:56 2006 @@ -16,10 +16,10 @@ public class Pattern { // contains String instances - ArrayList components; + ArrayList<String> components; public Pattern() { - components = new ArrayList(); + components = new ArrayList<String>(); } public Object clone() {

1 0

svn commit: r276 - logback/classic/trunk/src/test/java/ch/qos/logback/classic/control
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:37:45 2006 New Revision: 276 Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java Log: Type Safety Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java ============================================================================== --- logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java (original) +++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java Tue Jul 25 14:37:45 2006 @@ -30,8 +30,8 @@ } } - public List getActionList() { - return new ArrayList(actionList); + public List<TestAction> getActionList() { + return new ArrayList<TestAction>(actionList); } public int size() {

1 0

svn commit: r275 - logback/classic/trunk/src/test/java/ch/qos/logback/classic/control
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:37:11 2006 New Revision: 275 Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java Log: Type Safety Modified: logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java ============================================================================== --- logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java (original) +++ logback/classic/trunk/src/test/java/ch/qos/logback/classic/control/Scenario.java Tue Jul 25 14:37:11 2006 @@ -14,12 +14,13 @@ import java.util.Vector; import ch.qos.logback.classic.Level; +import ch.qos.logback.core.joran.action.Action; public class Scenario { // the frequency of a set levelInt event for every create logger event private final static int CREATE_LOGGER_TO_SET_LEVEL_FREQUENCY = 5; - private List actionList = new Vector(); + private List<TestAction> actionList = new Vector<TestAction>(); public void addAction(CreateLogger action) { actionList.add(action);

1 0

svn commit: r274 - logback/core/trunk/src/test/java/ch/qos/logback/core/status
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:34:44 2006 New Revision: 274 Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java Log: added tests for getEffectiveLevel() Modified: logback/core/trunk/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java ============================================================================== --- logback/core/trunk/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java (original) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java Tue Jul 25 14:34:44 2006 @@ -47,5 +47,33 @@ assertFalse("Remove result was not false", result); } } + + public void testEffectiveLevel() { + { + //effective level = 0 level deep + ErrorStatus status = new ErrorStatus("error", this); + WarnStatus warn = new WarnStatus("warning", this); + status.add(warn); + assertEquals("effective level misevaluated", status.getEffectiveLevel(), Status.ERROR); + } + + { + //effective level = 1 level deep + InfoStatus status = new InfoStatus("info", this); + WarnStatus warn = new WarnStatus("warning", this); + status.add(warn); + assertEquals("effective level misevaluated", status.getEffectiveLevel(), Status.WARN); + } + + { + //effective level = 2 levels deep + InfoStatus status = new InfoStatus("info", this); + WarnStatus warn = new WarnStatus("warning", this); + ErrorStatus error = new ErrorStatus("error", this); + status.add(warn); + warn.add(error); + assertEquals("effective level misevaluated", status.getEffectiveLevel(), Status.ERROR); + } + } }

1 0

svn commit: r273 - logback/core/trunk/src/main/java/ch/qos/logback/core/status
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:34:05 2006 New Revision: 273 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java Log: added implementation of getEffectiveLevel Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/status/StatusBase.java Tue Jul 25 14:34:05 2006 @@ -20,7 +20,7 @@ int level; final String message; final Object origin; - List childrenList; + List<Status> childrenList; Throwable throwable; @@ -41,7 +41,7 @@ "Null values are not valid Status."); } if (childrenList == null) { - childrenList = new ArrayList(); + childrenList = new ArrayList<Status>(); } childrenList.add(child); } @@ -72,6 +72,23 @@ public int getLevel() { return level; } + + public int getEffectiveLevel() { + int result = level; + int effLevel; + + Iterator it = iterator(); + Status s; + while(it.hasNext()) { + s = (Status)it.next(); + effLevel = s.getEffectiveLevel(); + if (effLevel > result) { + result = effLevel; + } + } + + return result; + } public String getMessage() { return message;

1 0

svn commit: r272 - logback/core/trunk/src/main/java/ch/qos/logback/core/status
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 14:33:50 2006 New Revision: 272 Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/Status.java Log: added getEffectiveLevel() Modified: logback/core/trunk/src/main/java/ch/qos/logback/core/status/Status.java ============================================================================== --- logback/core/trunk/src/main/java/ch/qos/logback/core/status/Status.java (original) +++ logback/core/trunk/src/main/java/ch/qos/logback/core/status/Status.java Tue Jul 25 14:33:50 2006 @@ -19,6 +19,7 @@ public final int ERROR = 2; int getLevel(); + int getEffectiveLevel(); Object getOrigin(); String getMessage(); Throwable getThrowable();

1 0

svn commit: r271 - logback/core/trunk/src/test/java/ch/qos/logback/core/status
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 11:56:30 2006 New Revision: 271 Added: logback/core/trunk/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java Log: initial commit Added: logback/core/trunk/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java ============================================================================== --- (empty file) +++ logback/core/trunk/src/test/java/ch/qos/logback/core/status/StatusBaseTest.java Tue Jul 25 11:56:30 2006 @@ -0,0 +1,51 @@ +package ch.qos.logback.core.status; + +import java.util.Iterator; + +import junit.framework.TestCase; + +public class StatusBaseTest extends TestCase { + + public void testAddStatus() { + { + InfoStatus status = new InfoStatus("testing", this); + status.add(new ErrorStatus("error", this)); + Iterator it = status.iterator(); + assertTrue("No status was added", it.hasNext()); + assertTrue("hasChilden method reported wrong result", status + .hasChildren()); + } + { + InfoStatus status = new InfoStatus("testing", this); + boolean thrown = false; + try { + status.add(null); + } catch (NullPointerException ex) { + thrown = true; + } + assertTrue("Exception was not thrown", thrown); + } + } + + public void testRemoveStatus() { + { + InfoStatus status = new InfoStatus("testing", this); + ErrorStatus error = new ErrorStatus("error", this); + status.add(error); + boolean result = status.remove(error); + Iterator it = status.iterator(); + assertTrue("Remove failed", result); + assertFalse("No status was removed", it.hasNext()); + assertFalse("hasChilden method reported wrong result", status + .hasChildren()); + } + { + InfoStatus status = new InfoStatus("testing", this); + ErrorStatus error = new ErrorStatus("error", this); + status.add(error); + boolean result = status.remove(null); + assertFalse("Remove result was not false", result); + } + } + +}

1 0

svn commit: r270 - logback/classic/trunk/src/main/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 10:39:13 2006 New Revision: 270 Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java Log: if the logger doesn't write anything, it sends an error to his context Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java ============================================================================== --- logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java (original) +++ logback/classic/trunk/src/main/java/ch/qos/logback/classic/Logger.java Tue Jul 25 10:39:13 2006 @@ -22,6 +22,7 @@ import ch.qos.logback.core.filter.Filter; import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; +import ch.qos.logback.core.status.ErrorStatus; public final class Logger implements org.slf4j.Logger, AppenderAttachable { @@ -263,7 +264,9 @@ } // No appenders in hierarchy - // FIXME: add an error to the error list + if (writes == 0) { + loggerContext.noAppenderDefinedWarning(this); + } } private int appendLoopOnAppenders(LoggingEvent event) { @@ -668,4 +671,12 @@ public String toString() { return "Logger[" + name + "]"; } + + /** + * Return the context for this logger. + * @return + */ + public LoggerContext getLoggerContext() { + return loggerContext; + } }

1 0

svn commit: r269 - logback/classic/trunk/src/main/java/ch/qos/logback/classic
by noreply.seb＠qos.ch 25 Jul '06

25 Jul '06

Author: seb Date: Tue Jul 25 10:37:54 2006 New Revision: 269 Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/LoggerContext.java Log: Context now adds an error if no appender is in the hierarchy Modified: logback/classic/trunk/src/main/java/ch/qos/logback/classic/LoggerContext.java ============================================================================== --- logback/classic/trunk/src/main/java/ch/qos/logback/classic/LoggerContext.java (original) +++ logback/classic/trunk/src/main/java/ch/qos/logback/classic/LoggerContext.java Tue Jul 25 10:37:54 2006 @@ -15,6 +15,7 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.CoreGlobal; +import ch.qos.logback.core.status.ErrorStatus; /** @@ -24,6 +25,7 @@ private Logger root; private int size; + private int noAppenderWarning = 0; // We want loggerCache to be synchronized so Hashtable is a good choice. In practice, it // performs a little faster than the map returned by Collections.synchronizedMap at the @@ -103,6 +105,12 @@ */ Logger exists(String name) { return (Logger) loggerCache.get(name); - + } + + final void noAppenderDefinedWarning(final Logger logger) { + if (noAppenderWarning++ == 0) { + getStatusManager().add(new ErrorStatus( + "No appenders present in the hierarchy ["+ getName() +"] for logger [" + logger.getName() + "].", logger)); + } } }

1 0