December 2008 - logback-dev

[JIRA] Created: (LBCLASSIC-93) start mehtod/ default mdc value property
by Ceki Gulcu (JIRA) 18 Dec '08

18 Dec '08

start mehtod/ default mdc value property ---------------------------------------- Key: LBCLASSIC-93 URL: http://jira.qos.ch/browse/LBCLASSIC-93 Project: logback-classic Issue Type: Sub-task Components: appender Reporter: Ceki Gulcu Assignee: Logback dev list Priority: Blocker Fix For: 0.9.14 Work on the start method Add "default" mdc value property -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 2

[JIRA] Created: (LBCLASSIC-98) NPE when calling setContextMap on a fresch MDC.
by Ceki Gulcu (JIRA) 18 Dec '08

18 Dec '08

NPE when calling setContextMap on a fresch MDC. ----------------------------------------------- Key: LBCLASSIC-98 URL: http://jira.qos.ch/browse/LBCLASSIC-98 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.13 Reporter: Ceki Gulcu Assignee: Ceki Gulcu Fix For: 0.9.14 Reported by Francois_Terrier in http://www.qos.ch/pipermail/logback-user/2008-December/000864.html there is a little NPE when calling setContextMap on a fresch MDC. This could raises a NPE: public static void main(String[] args) { MDC.setContextMap(new HashMap<String, String>()); } -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 1

svn commit: r2083 - in logback/trunk/logback-classic/src: main/java/org/slf4j/impl test/java/ch/qos/logback/classic
by noreply.ceki＠qos.ch 18 Dec '08

18 Dec '08

Author: ceki Date: Thu Dec 18 14:22:04 2008 New Revision: 2083 Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java Log: Fixed LBCLASSIC-98 (NPE thrown when calling setContextMap on a fresh MDC) Modified: logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java (original) +++ logback/trunk/logback-classic/src/main/java/org/slf4j/impl/LogbackMDCAdapter.java Thu Dec 18 14:22:04 2008 @@ -10,12 +10,9 @@ * A Mapped Diagnostic Context, or MDC in short, is an instrument * for distinguishing interleaved log output from different sources. Log output * is typically interleaved when a server handles multiple clients - * near-simultaneously. - * - * The MDC is managed on a per thread basis. A child thread - * automatically inherits a copy of the mapped diagnostic context of - * its parent. - * + * near-simultaneously. The MDC is managed on a per thread basis. + * A child thread automatically inherits a copy of the mapped + * diagnostic context of its parent. * * For more information about MDC, please refer to the online manual at * http://logback.qos.ch/manual/mdc.html @@ -24,7 +21,8 @@ */ public class LogbackMDCAdapter implements MDCAdapter { - //final CopyOnInheritThreadLocal copyOnInheritThreadLocal = new CopyOnInheritThreadLocal(); + // final CopyOnInheritThreadLocal copyOnInheritThreadLocal = new + // CopyOnInheritThreadLocal(); final CopyOnInheritThreadLocal copyOnInheritThreadLocal = new CopyOnInheritThreadLocal(); @@ -36,13 +34,11 @@ * the <code>key</code> parameter into the current thread's context map. * Note that contrary to log4j, the <code>val</code> parameter can be null. * - * - * If the current thread does not have a context map it is created as a side - * effect of this call. + * If the current thread does not have a context map it is created as a + * side effect of this call. * - * - * Each time a value is added, a new instance of the map is created. This is - * to be certain that the serialization process will operate on the updated + * Each time a value is added, a new instance of the map is created. This + * is to be certain that the serialization process will operate on the updated * map and not send a reference to the old map, thus not allowing the remote * logback component to see the latest changes. * @@ -68,8 +64,7 @@ /** * Get the context identified by the <code>key</code> parameter. * - * - * This method has no side effects. + * This method has no side effects. */ public String get(String key) { HashMap<String, String> hashMap = copyOnInheritThreadLocal.get(); @@ -84,11 +79,10 @@ /** * Remove the the context identified by the <code>key</code> parameter. * - * - * Each time a value is removed, a new instance of the map is created. This is - * to be certain that the serialization process will operate on the updated - * map and not send a reference to the old map, thus not allowing the remote - * logback component to see the latest changes. + * Each time a value is removed, a new instance of the map is created. + * This is to be certain that the serialization process will operate on the + * updated map and not send a reference to the old map, thus not allowing the + * remote logback component to see the latest changes. */ public void remove(String key) { HashMap<String, String> oldMap = copyOnInheritThreadLocal.get(); @@ -160,7 +154,9 @@ copyOnInheritThreadLocal.set(newMap); // hints for the garbage collector - oldMap.clear(); - oldMap = null; + if (oldMap != null) { + oldMap.clear(); + oldMap = null; + } } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/MDCTest.java Thu Dec 18 14:22:04 2008 @@ -12,7 +12,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; +import java.util.HashMap; + import org.junit.Test; +import org.slf4j.MDC; public class MDCTest { @@ -37,4 +40,9 @@ } + @Test + public void testLBCLASSIC_98() { + MDC.setContextMap(new HashMap<String, String>()); + } + }

1 0

svn commit: r2082 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/hoard test/input/joran/hoard test/java/ch/qos/logback/classic test/java/ch/qos/logback/classic/hoard test/java/ch/qos/logback/classic/hoard/tracker
by noreply.ceki＠qos.ch 17 Dec '08

17 Dec '08

Author: ceki Date: Wed Dec 17 18:46:01 2008 New Revision: 2082 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderTracker.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderTrackerImpl.java logback/trunk/logback-classic/src/test/input/joran/hoard/smoke.xml logback/trunk/logback-classic/src/test/input/joran/hoard/unsetDefaultValueProperty.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/AppenderTrackerTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/PackageTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/ScenarioBasedAppenderTrackerTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/Simulator.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/AppenderTrackerTImpl.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/SimulationEvent.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/TEntry.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingJoranConfigurator.java logback/trunk/logback-classic/src/test/input/joran/hoard/hoard0.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/HoardingAppenderTest.java Log: Code to track and clean up appenders. Related to LBCLASSIC-94 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderTracker.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderTracker.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,19 @@ +package ch.qos.logback.classic.hoard; + +import java.util.List; + +import ch.qos.logback.core.Appender; + +public interface AppenderTracker<E> { + + static int MILLIS_IN_ONE_SECOND = 1000; + static int THRESHOLD = 30 * 60 * MILLIS_IN_ONE_SECOND; // 30 minutes + + void put(String key, Appender<E> value, long timestamp); + Appender<E> get(String key, long timestamp); + void stopStaleAppenders(long now); + List<String> keyList(); + List<Appender<E>> valueList(); + + +} \ No newline at end of file Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderTrackerImpl.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderTrackerImpl.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,216 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.hoard; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import ch.qos.logback.core.Appender; + +/** + * Track appenders by a key. When an appender is not used for + * longer than THRESHOLD, stop it. + * @author Ceki Gulcu + */ +public class AppenderTrackerImpl<E> implements AppenderTracker<E> { + + Map<String, Entry> map = new HashMap<String, Entry>(); + + Entry head; // least recently used entries are towards the head + Entry tail; // most recently used entries are towards the tail + + long lastCheck = 0; + + AppenderTrackerImpl() { + head = new Entry(null, null, 0); + tail = head; + } + + /* (non-Javadoc) + * @see ch.qos.logback.classic.hoard.AppenderTracker#put(java.lang.String, ch.qos.logback.core.Appender, long) + */ + public synchronized void put(String key, Appender<E> value, long timestamp) { + Entry entry = map.get(key); + if (entry == null) { + entry = new Entry(key, value, timestamp); + map.put(key, entry); + } + moveToTail(entry); + } + + /* (non-Javadoc) + * @see ch.qos.logback.classic.hoard.AppenderTracker#get(java.lang.String, long) + */ + public synchronized Appender<E> get(String key, long timestamp) { + Entry existing = map.get(key); + if (existing == null) { + return null; + } else { + existing.setTimestamp(timestamp); + moveToTail(existing); + return existing.value; + } + } + + + /* (non-Javadoc) + * @see ch.qos.logback.classic.hoard.AppenderTracker#stopStaleAppenders(long) + */ + public synchronized void stopStaleAppenders(long now) { + if (lastCheck + MILLIS_IN_ONE_SECOND > now) { + return; + } + lastCheck = now; + while (head.value != null && isEntryStale(head,now)) { + Appender appender = head.value; + //System.out.println(" stopping "+appender); + appender.stop(); + removeHead(); + } + } + + public List<String> keyList() { + List<String> result = new LinkedList<String>(); + Entry e = head; + while (e != tail) { + result.add(e.key); + e = e.next; + } + return result; + } + + + final private boolean isEntryStale(Entry entry, long now) { + return ((entry.timestamp + THRESHOLD) < now); + } + + + private void removeHead() { + // System.out.println("RemoveHead called"); + map.remove(head.key); + head = head.next; + head.prev = null; + } + + private void moveToTail(Entry e) { + rearrangePreexistingLinks(e); + rearrangeTailLinks(e); + } + + private void rearrangePreexistingLinks(Entry e) { + if (e.prev != null) { + e.prev.next = e.next; + } + if (e.next != null) { + e.next.prev = e.prev; + } + if (head == e) { + head = e.next; + } + } + + private void rearrangeTailLinks(Entry e) { + if (head == tail) { + head = e; + } + Entry preTail = tail.prev; + if (preTail != null) { + preTail.next = e; + } + e.prev = preTail; + e.next = tail; + tail.prev = e; + } + + public void dump() { + Entry e = head; + System.out.print("N:"); + while (e != null) { + // System.out.print(e+"->"); + System.out.print(e.key + ", "); + e = e.next; + } + System.out.println(); + } + + + + public List<Appender<E>> valueList() { + List<Appender<E>> result = new LinkedList<Appender<E>>(); + Entry e = head; + while (e != tail) { + result.add(e.value); + e = e.next; + } + return result; + } + + // ================================================================ + private class Entry { + Entry next; + Entry prev; + + String key; + Appender<E> value; + long timestamp; + + Entry(String k, Appender<E> v, long timestamp) { + this.key = k; + this.value = v; + this.timestamp = timestamp; + } + + public long getTimestamp() { + return timestamp; + } + + public void setTimestamp(long timestamp) { + this.timestamp = timestamp; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((key == null) ? 0 : key.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final Entry other = (Entry) obj; + if (key == null) { + if (other.key != null) + return false; + } else if (!key.equals(other.key)) + return false; + if (value == null) { + if (other.value != null) + return false; + } else if (!value.equals(other.value)) + return false; + return true; + } + + @Override + public String toString() { + return "(" + key + ", " + value + ")"; + } + } + +} Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingAppender.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingAppender.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingAppender.java Wed Dec 17 18:46:01 2008 @@ -1,22 +1,39 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package ch.qos.logback.classic.hoard; -import java.util.Hashtable; -import java.util.Map; - import org.slf4j.MDC; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.UnsynchronizedAppenderBase; import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.OptionHelper; +/** + * This appender can contains other appenders which it can build dynamically + * depending on MDC values. The built appender is specified as part of a + * configuration file. + * + * See the logback manual for further details. + * + * + * @author Ceki Gulcu + */ public class HoardingAppender extends UnsynchronizedAppenderBase<LoggingEvent> { - static String DEFAULT = "default"; - - Map<String, Appender<LoggingEvent>> appenderMap = new Hashtable<String, Appender<LoggingEvent>>(); + AppenderTracker<LoggingEvent> appenderTracker = new AppenderTrackerImpl<LoggingEvent>(); + //Map<String, Appender<LoggingEvent>> appenderMap = new Hashtable<String, Appender<LoggingEvent>>(); String mdcKey; + String defaultValue; AppenderFactory appenderFactory; @@ -24,26 +41,57 @@ this.appenderFactory = appenderFactory; } - - + @Override + public void start() { + int errors = 0; + if (OptionHelper.isEmpty(mdcKey)) { + errors++; + addError("The \"mdcKey\" property must be set"); + } + if (OptionHelper.isEmpty(defaultValue)) { + errors++; + addError("The \"defaultValue\" property must be set"); + } + if (errors == 0) { + super.start(); + } + } + + @Override + public void stop() { + for (Appender<LoggingEvent> appender : appenderTracker.valueList()) { + appender.stop(); + } + } + @Override protected void append(LoggingEvent loggingEvent) { + if (!isStarted()) { + return; + } + String mdcValue = MDC.get(mdcKey); if (mdcValue == null) { - mdcValue = DEFAULT; + mdcValue = defaultValue; } - Appender<LoggingEvent> appender = appenderMap.get(mdcValue); + long timestamp = loggingEvent.getTimeStamp(); + + Appender<LoggingEvent> appender = appenderTracker.get(mdcValue, timestamp); if (appender == null) { try { appender = appenderFactory.buildAppender(context, mdcKey, mdcValue); + if (appender != null) { + appenderTracker.put(mdcValue, appender, timestamp); + } } catch (JoranException e) { addError("Failed to build appender for " + mdcKey + "=" + mdcValue, e); return; } } + appenderTracker.stopStaleAppenders(timestamp); appender.doAppend(loggingEvent); } @@ -54,6 +102,29 @@ public void setMdcKey(String mdcKey) { this.mdcKey = mdcKey; } - - + + /** + * @see #setDefaultValue(String) + * @return + */ + public String getDefaultValue() { + return defaultValue; + } + + /** + * The default MDC value in case the MDC is not set for + * {@link #setMdcKey(String) mdcKey}. + * + * For example, if {@link #setMdcKey(String) mdcKey} is set to the value + * "someKey", and the MDC is not set for "someKey", then this appender will + * use the default value, which you can set with the help of method. + * + * The "defaultValue" property is set to the value "DEFAULT" by default. + * + * @param defaultValue + */ + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + } Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingJoranConfigurator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingJoranConfigurator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingJoranConfigurator.java Wed Dec 17 18:46:01 2008 @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Appender; import ch.qos.logback.core.joran.GenericConfigurator; import ch.qos.logback.core.joran.action.ActionConst; @@ -55,10 +56,11 @@ interpreter.setInterpretationContextPropertiesMap(propertiesMap); } - public Appender getAppender() { + @SuppressWarnings("unchecked") + public Appender<LoggingEvent> getAppender() { Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap(); HashMap map = (HashMap) omap.get(ActionConst.APPENDER_BAG); Collection values = map.values(); - return (Appender) values.iterator().next(); + return (Appender<LoggingEvent>) values.iterator().next(); } } Modified: logback/trunk/logback-classic/src/test/input/joran/hoard/hoard0.xml ============================================================================== --- logback/trunk/logback-classic/src/test/input/joran/hoard/hoard0.xml (original) +++ logback/trunk/logback-classic/src/test/input/joran/hoard/hoard0.xml Wed Dec 17 18:46:01 2008 @@ -7,10 +7,9 @@ class="ch.qos.logback.classic.hoard.HoardingAppender"> <mdcKey>userid</mdcKey> - - + <default>asdad</default> <hoard> - <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <appender name="FILE-${userid}" class="ch.qos.logback.core.FileAppender"> <File>${userid}.log</File> <Append>true</Append> <layout class="ch.qos.logback.classic.PatternLayout"> @@ -18,7 +17,6 @@ </layout> </appender> </hoard> - </appender> <root level="DEBUG"> Added: logback/trunk/logback-classic/src/test/input/joran/hoard/smoke.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/hoard/smoke.xml Wed Dec 17 18:46:01 2008 @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="true"> + + <appender name="HOARD" + class="ch.qos.logback.classic.hoard.HoardingAppender"> + + <mdcKey>userid</mdcKey> + <defaultValue>smoke</defaultValue> + <hoard> + <appender name="list-${userid}" class="ch.qos.logback.core.read.ListAppender"/> + </hoard> + </appender> + + <root level="DEBUG"> + <appender-ref ref="HOARD" /> + </root> + +</configuration> Added: logback/trunk/logback-classic/src/test/input/joran/hoard/unsetDefaultValueProperty.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/hoard/unsetDefaultValueProperty.xml Wed Dec 17 18:46:01 2008 @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="true"> + + <appender name="HOARD" + class="ch.qos.logback.classic.hoard.HoardingAppender"> + + <mdcKey>userid</mdcKey> + <hoard> + <appender name="list-${userid}" class="ch.qos.logback.core.read.ListAppender"/> + </hoard> + </appender> + + <root level="DEBUG"> + <appender-ref ref="HOARD" /> + </root> + +</configuration> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java Wed Dec 17 18:46:01 2008 @@ -20,20 +20,23 @@ TestSuite suite = new TestSuite(); suite.addTest(org.slf4j.impl.PackageTest.suite()); - suite.addTest(new JUnit4TestAdapter(ch.qos.logback.classic.PackageTest.class)); + suite.addTest(new JUnit4TestAdapter( + ch.qos.logback.classic.PackageTest.class)); suite.addTest(ch.qos.logback.classic.util.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.control.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.joran.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.jmx.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.jmx.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.boolex.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.selector.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.html.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.selector.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.html.PackageTest.suite()); suite.addTest(ch.qos.logback.classic.net.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.pattern.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.db.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.spi.PackageTest.suite()); - suite.addTest(ch.qos.logback.classic.turbo.PackageTest.suite()); - + suite.addTest(ch.qos.logback.classic.pattern.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.db.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.spi.PackageTest.suite()); + suite.addTest(ch.qos.logback.classic.turbo.PackageTest.suite()); + suite.addTest(new JUnit4TestAdapter( + ch.qos.logback.classic.hoard.PackageTest.class)); + return suite; } } Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/AppenderTrackerTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/AppenderTrackerTest.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,53 @@ +package ch.qos.logback.classic.hoard; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.read.ListAppender; + +public class AppenderTrackerTest { + + + Context context = new ContextBase(); + AppenderTracker<Object> appenderTracker = new AppenderTrackerImpl<Object>(); + ListAppender<Object> la = new ListAppender<Object>(); + + @Before + public void setUp() { + la.setContext(context); + la.start(); + } + + @Test + public void empty() { + long now = 3000; + assertNull(appenderTracker.get("a", now++)); + now += AppenderTrackerImpl.THRESHOLD+1000; + appenderTracker.stopStaleAppenders(now); + assertNull(appenderTracker.get("a", now++)); + } + + @Test + public void smoke() { + assertTrue(la.isStarted()); + long now = 3000; + appenderTracker.put("a", la, now); + assertEquals(la, appenderTracker.get("a", now++)); + now += AppenderTrackerImpl.THRESHOLD+1000; + appenderTracker.stopStaleAppenders(now); + assertFalse(la.isStarted()); + assertNull(appenderTracker.get("a", now++)); + } + + @Test + public void scenarioBased() { + + } +} Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/HoardingAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/HoardingAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/HoardingAppenderTest.java Wed Dec 17 18:46:01 2008 @@ -9,13 +9,21 @@ */ package ch.qos.logback.classic.hoard; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import java.util.List; + import org.junit.Test; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.classic.util.TeztConstants; import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.util.StatusPrinter; public class HoardingAppenderTest { @@ -32,6 +40,29 @@ jc.doConfigure(file); } + @Test + public void unsetDefaultValueProperty() throws JoranException { + configure(PREFIX + "unsetDefaultValueProperty.xml"); + logger.debug("hello"); + HoardingAppender ha = (HoardingAppender) root.getAppender("HOARD"); + assertFalse(ha.isStarted()); + + } + + @Test + public void smoke() throws JoranException { + configure(PREFIX + "smoke.xml"); + logger.debug("smoke"); + long timestamp = 0; + HoardingAppender ha = (HoardingAppender) root.getAppender("HOARD"); + ListAppender<LoggingEvent> listAppender = (ListAppender<LoggingEvent>) ha.appenderTracker.get("smoke", timestamp); + StatusPrinter.print(loggerContext); + + assertNotNull(listAppender); + List<LoggingEvent> eventList = listAppender.list; + assertEquals(1, listAppender.list.size()); + assertEquals("smoke", eventList.get(0).getMessage()); + } @Test public void testLevel() throws JoranException { Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/PackageTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/PackageTest.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,19 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.hoard; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +(a)RunWith(Suite.class) +(a)SuiteClasses({HoardingAppenderTest.class}) +public class PackageTest { +} \ No newline at end of file Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/ScenarioBasedAppenderTrackerTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/ScenarioBasedAppenderTrackerTest.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,53 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.hoard; + +import static org.junit.Assert.assertEquals; + +import org.junit.Ignore; +import org.junit.Test; + +public class ScenarioBasedAppenderTrackerTest { + + Simulator simulator; + + void verify() { + AppenderTracker at = simulator.appenderTracker; + AppenderTracker t_at = simulator.t_appenderTracker; + //List<String> resultKeys = at.keyList(); + //List<String> witnessKeys = t_at.keyList(); + assertEquals(t_at.keyList(), at.keyList()); + } + + @Test + public void shortTest() { + simulator = new Simulator(20, AppenderTracker.THRESHOLD / 2); + simulator.buildScenario(200); + simulator.simulate(); + verify(); + } + + @Test + public void mediumTest() { + simulator = new Simulator(100, AppenderTracker.THRESHOLD / 2); + simulator.buildScenario(20000); + simulator.simulate(); + verify(); + } + + @Test + @Ignore + public void longetTest() { + simulator = new Simulator(100, AppenderTracker.THRESHOLD / 200); + simulator.buildScenario(2000000); + simulator.simulate(); + verify(); + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/Simulator.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/Simulator.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,92 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.hoard; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; + +import ch.qos.logback.classic.hoard.tracker.SimulationEvent; +import ch.qos.logback.classic.hoard.tracker.AppenderTrackerTImpl; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.appender.NOPAppender; + +/** + * Simulate use of AppenderTracker by HoardAppender. + * + * @author ceki + * + */ +public class Simulator { + + AppenderTrackerImpl<Object> appenderTracker = new AppenderTrackerImpl<Object>(); + AppenderTrackerTImpl t_appenderTracker = new AppenderTrackerTImpl(); + + List<String> keySpace = new ArrayList<String>(); + List<SimulationEvent> scenario = new ArrayList<SimulationEvent>(); + Random randomKeyGen = new Random(100); + + Random random = new Random(11234); + + final int maxTimestampInc; + long timestamp = 30000; + + Simulator(int keySpaceLen, int maxTimestampInc) { + this.maxTimestampInc = maxTimestampInc; + Map<String, String> checkMap = new HashMap<String, String>(); + for (int i = 0; i < keySpaceLen; i++) { + String k = getRandomKeyStr(); + if (checkMap.containsKey(k)) { + System.out.println("random key collision occured"); + k += "" + i; + } + keySpace.add(k); + checkMap.put(k, k); + } + + } + + private String getRandomKeyStr() { + int ri = randomKeyGen.nextInt(); + String s = String.format("%X", ri); + return s; + } + + void buildScenario(int simLen) { + int keySpaceLen = keySpace.size(); + for (int i = 0; i < simLen; i++) { + int index = random.nextInt(keySpaceLen); + timestamp += random.nextInt(maxTimestampInc); + String key = keySpace.get(index); + scenario.add(new SimulationEvent(key, timestamp)); + } + } + + public void simulate() { + for (SimulationEvent simeEvent : scenario) { + play(simeEvent, appenderTracker); + play(simeEvent, t_appenderTracker); + } + } + + void play(SimulationEvent simulationEvent, + AppenderTracker<Object> appenderTracker) { + String mdcValue = simulationEvent.key; + long timestamp = simulationEvent.timestamp; + Appender<Object> appender = appenderTracker.get(mdcValue, timestamp); + if (appender == null) { + appender = new NOPAppender<Object>(); + appenderTracker.put(mdcValue, appender, timestamp); + } + appenderTracker.stopStaleAppenders(timestamp); + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/AppenderTrackerTImpl.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/AppenderTrackerTImpl.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,98 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.hoard.tracker; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; + +import ch.qos.logback.classic.hoard.AppenderTracker; +import ch.qos.logback.core.Appender; + +/** + * This is an alternative (slower) implementation of AppenderTracker for testing + * purposes. + * + * @author Ceki Gulcu + */ +public class AppenderTrackerTImpl implements AppenderTracker<Object> { + + List<TEntry> entryList = new LinkedList<TEntry>(); + long lastCheck = 0; + + public AppenderTrackerTImpl() { + } + + @SuppressWarnings("unchecked") + synchronized public void put(String k, Appender<Object> appender, + long timestamp) { + TEntry te = getEntry(k); + if (te != null) { + te.timestamp = timestamp; + } else { + te = new TEntry(k, appender, timestamp); + entryList.add(te); + } + Collections.sort(entryList); + } + + @SuppressWarnings("unchecked") + synchronized public Appender<Object> get(String k, long timestamp) { + TEntry te = getEntry(k); + if (te == null) { + return null; + } else { + te.timestamp = timestamp; + Collections.sort(entryList); + return te.appender; + } + } + + synchronized public void stopStaleAppenders(long timestamp) { + if (lastCheck + MILLIS_IN_ONE_SECOND > timestamp) { + return; + } + lastCheck = timestamp; + while (entryList.size() != 0 && isEntryStale(entryList.get(0), timestamp)) { + entryList.remove(0); + } + } + + final private boolean isEntryStale(TEntry entry, long now) { + return ((entry.timestamp + THRESHOLD) < now); + } + + synchronized public List<String> keyList() { + List<String> keyList = new ArrayList<String>(); + for (TEntry e : entryList) { + keyList.add(e.key); + } + return keyList; + } + + synchronized public List<Appender<Object>> valueList() { + List<Appender<Object>> appenderList = new ArrayList<Appender<Object>>(); + for (TEntry e : entryList) { + appenderList.add(e.appender); + } + return appenderList; + } + + private TEntry getEntry(String k) { + for (int i = 0; i < entryList.size(); i++) { + TEntry te = entryList.get(i); + if (te.key.equals(k)) { + return te; + } + } + return null; + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/SimulationEvent.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/SimulationEvent.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,17 @@ +package ch.qos.logback.classic.hoard.tracker; + + +public class SimulationEvent { + + public String key; + public long timestamp; + + public SimulationEvent(String key, long timestamp) { + this.key = key; + this.timestamp = timestamp; + } + + public String toString() { + return "Event: k=" + key +", timestamp=" + timestamp; + } +} Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/TEntry.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/tracker/TEntry.java Wed Dec 17 18:46:01 2008 @@ -0,0 +1,45 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.hoard.tracker; + +import ch.qos.logback.core.Appender; + +public class TEntry implements Comparable { + + String key; + long timestamp; + Appender<Object> appender; + + TEntry(String key, Appender<Object> appender, long timestamp) { + this.key = key; + this.appender = appender; + this.timestamp = timestamp; + } + + public int compareTo(Object o) { + if(!(o instanceof TEntry)) { + throw new IllegalArgumentException("arguments must be of type "+TEntry.class); + } + + TEntry other = (TEntry) o; + if(timestamp > other.timestamp) { + return 1; + } + if(timestamp == other.timestamp) { + return 0; + } + return -1; + } + + @Override + public String toString() { + return "("+key+","+timestamp+")"; + } +}

1 0

[JIRA] Created: (LBCLASSIC-95) clean up appenders as their MDC value is cleared
by Ceki Gulcu (JIRA) 17 Dec '08

17 Dec '08

clean up appenders as their MDC value is cleared ------------------------------------------------ Key: LBCLASSIC-95 URL: http://jira.qos.ch/browse/LBCLASSIC-95 Project: logback-classic Issue Type: Sub-task Reporter: Ceki Gulcu Assignee: Ceki Gulcu -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 2

svn commit: r2081 - logback-demo/trunk
by noreply.ceki＠qos.ch 15 Dec '08

15 Dec '08

Author: ceki Date: Mon Dec 15 22:41:53 2008 New Revision: 2081 Modified: logback-demo/trunk/pom.xml Log: Modified: logback-demo/trunk/pom.xml ============================================================================== --- logback-demo/trunk/pom.xml (original) +++ logback-demo/trunk/pom.xml Mon Dec 15 22:41:53 2008 @@ -9,7 +9,7 @@ <version>1.0</version> <properties> - <lb.version>0.9.10-SNAPSHOT</lb.version> + <lb.version>0.9.13</lb.version> </properties>

1 0

svn commit: r2080 - in logback-demo/trunk/src: etc main/java/ch/qos/logback/demo main/java/ch/qos/logback/demo/prime main/java/ch/qos/logback/demo/reload main/java/ch/qos/logback/demo/statii main/java/ch/qos/logback/demo/util main/resources
by noreply.ceki＠qos.ch 15 Dec '08

15 Dec '08

Author: ceki Date: Mon Dec 15 22:41:47 2008 New Revision: 2080 Modified: logback-demo/trunk/src/etc/logback-access.xml logback-demo/trunk/src/main/java/ch/qos/logback/demo/LoggingTask.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/ViewLastLog.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/NumberCruncherImpl.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/PrimeForm.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/reload/ReloadConfigAction.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseContextAction.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseModuleAction.java logback-demo/trunk/src/main/java/ch/qos/logback/demo/util/EnhancedStatusPrinter.java logback-demo/trunk/src/main/resources/logback.xml Log: Modified: logback-demo/trunk/src/etc/logback-access.xml ============================================================================== --- logback-demo/trunk/src/etc/logback-access.xml (original) +++ logback-demo/trunk/src/etc/logback-access.xml Mon Dec 15 22:41:47 2008 @@ -50,14 +50,16 @@ --> -  - + +  +  Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/LoggingTask.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/LoggingTask.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/LoggingTask.java Mon Dec 15 22:41:47 2008 @@ -8,17 +8,24 @@ public class LoggingTask implements Runnable { static Marker HOWDY_MARKER = MarkerFactory.getMarker("HOWDY"); + static Marker TOTO = MarkerFactory.getMarker("TOTO"); + + static { + TOTO.add(HOWDY_MARKER); + } Logger logger = LoggerFactory.getLogger(LoggingTask.class); - + String msg; + int i = 0; - + LoggingTask(String msg) { this.msg = msg; } + public void run() { - //logger.info(msg +" - " + (i++)); - logger.info(HOWDY_MARKER, msg +" - " + (i++)); + // logger.info(msg +" - " + (i++)); + logger.info(HOWDY_MARKER, msg + " - " + (i++), new Exception("e")); } } Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/ViewLastLog.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/ViewLastLog.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/ViewLastLog.java Mon Dec 15 22:41:47 2008 @@ -16,11 +16,11 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.html.HTMLLayout; import ch.qos.logback.classic.html.UrlCssBuilder; +import ch.qos.logback.classic.spi.LoggerContextListener; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.read.CyclicBufferAppender; -import ch.qos.logback.classic.spi.ContextListener; -public class ViewLastLog extends HttpServlet implements ContextListener { +public class ViewLastLog extends HttpServlet implements LoggerContextListener { private static final long serialVersionUID = -3551928133801157219L; private boolean listening = false; @@ -119,4 +119,11 @@ layout.setTitle("Last Logging Events"); layout.start(); } + + public boolean isResetResistant() { + return false; + } + + public void onStop(LoggerContext arg0) { + } } Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/NumberCruncherImpl.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/NumberCruncherImpl.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/NumberCruncherImpl.java Mon Dec 15 22:41:47 2008 @@ -33,8 +33,11 @@ logger.info("Beginning to factor."); if (number <= 0) { - throw new IllegalArgumentException(number + + IllegalArgumentException e = new IllegalArgumentException(number + " is not a positive integer."); + logger.error("Bad argument", e); + //throw e; + return new Long[] { 0L }; } else if (number == 1) { return new Long[] { 1L }; } @@ -51,8 +54,8 @@ logger.warn("Already tried " + MAX_COUNT_BEFORE_WARN + " factors."); count = 0; } - logger.debug("Trying "+i+" as a factor."); - //logger.debug("Trying {} as a factor.", i); + //logger.debug("Trying "+i+" as a factor."); + logger.debug("Trying {} as a factor.", i); if ((n % i) == 0) { logger.info("Found factor " + i); Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/PrimeForm.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/PrimeForm.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/prime/PrimeForm.java Mon Dec 15 22:41:47 2008 @@ -26,7 +26,7 @@ ActionMapping mapping, HttpServletRequest request ) { ActionErrors errors = new ActionErrors(); - if( getNumber() == null || getNumber().longValue() < 1 ) { + if( getNumber() == null || ((getNumber().longValue()) != -1 && (getNumber().longValue() < 1))) { errors.add("number",new ActionMessage("errors.minNumber")); } Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/reload/ReloadConfigAction.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/reload/ReloadConfigAction.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/reload/ReloadConfigAction.java Mon Dec 15 22:41:47 2008 @@ -64,7 +64,7 @@ configurator.setContext(lc); logger.info("Shutting down active logging configuration."); - lc.shutdownAndReset(); + lc.reset(); configurator.doConfigure(url); lc.start(); logger.info("Now using new configuration."); Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseContextAction.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseContextAction.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseContextAction.java Mon Dec 15 22:41:47 2008 @@ -31,12 +31,12 @@ ChooseContextForm form = (ChooseContextForm) actionForm; String contextName = form.getContextName(); - LoggerContext context = StaticLoggerBinder.SINGLETON.getContextSelector().getLoggerContext(contextName); + LoggerContext context = StaticLoggerBinder.getSingleton().getContextSelector().getLoggerContext(contextName); EnhancedStatusPrinter.print(buf, context.getStatusManager()); request.setAttribute(Constants.STATUS, buf.toString()); } - List<String> contextNames = StaticLoggerBinder.SINGLETON.getContextSelector().getContextNames(); + List<String> contextNames = StaticLoggerBinder.getSingleton().getContextSelector().getContextNames(); request.setAttribute(Constants.CONTEXT_LIST, contextNames); return actionMapping.findForward("next"); Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseModuleAction.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseModuleAction.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/statii/ChooseModuleAction.java Mon Dec 15 22:41:47 2008 @@ -48,7 +48,7 @@ request.setAttribute(Constants.STATUS, buf.toString()); } else { - List<String> contextNames = StaticLoggerBinder.SINGLETON.getContextSelector().getContextNames(); + List<String> contextNames = StaticLoggerBinder.getSingleton().getContextSelector().getContextNames(); request.setAttribute(Constants.CONTEXT_LIST, contextNames); } } Modified: logback-demo/trunk/src/main/java/ch/qos/logback/demo/util/EnhancedStatusPrinter.java ============================================================================== --- logback-demo/trunk/src/main/java/ch/qos/logback/demo/util/EnhancedStatusPrinter.java (original) +++ logback-demo/trunk/src/main/java/ch/qos/logback/demo/util/EnhancedStatusPrinter.java Mon Dec 15 22:41:47 2008 @@ -3,18 +3,17 @@ import java.io.PrintWriter; import java.io.StringWriter; import java.text.SimpleDateFormat; - import java.util.Iterator; import java.util.List; -import ch.qos.logback.classic.pattern.ClassNameAbbreviator; +import ch.qos.logback.classic.pattern.TargetLengthBasedClassNameAbbreviator; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusManager; public class EnhancedStatusPrinter { private static final int ABBR_LENGTH = 17; - private static ClassNameAbbreviator abbreviator = new ClassNameAbbreviator(ABBR_LENGTH); + private static TargetLengthBasedClassNameAbbreviator abbreviator = new TargetLengthBasedClassNameAbbreviator(ABBR_LENGTH); private static SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd'T'HH:mm:ss"); public static String print(Status s) { @@ -81,7 +80,6 @@ Status child = ite.next(); print(buf, indentation+" ", child); } - } } Modified: logback-demo/trunk/src/main/resources/logback.xml ============================================================================== --- logback-demo/trunk/src/main/resources/logback.xml (original) +++ logback-demo/trunk/src/main/resources/logback.xml Mon Dec 15 22:41:47 2008 @@ -5,7 +5,7 @@ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <layout class="ch.qos.logback.classic.PatternLayout"> - <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{32} - %msg%n</pattern> + <pattern>%marker %d{HH:mm:ss.SSS} [%thread] %-5level %logger{32} - %msg%n</pattern> </layout> </appender> @@ -15,25 +15,26 @@ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <FileNamePattern> - logFile.%d{yyyy-MM-dd_HH-mm}.log.zip + z:/logFile.%d{yyyy-MM-dd_HH-mm}.log.zip </FileNamePattern> + <maxHistory>5</maxHistory> </rollingPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> - <Pattern> - %-26(%d{HH:mm:ss,SSS} [%thread]) %-5level %logger{32} - %msg%n + <Pattern>%marker %-26(%d{HH:mm:ss,SSS} [%thread]) %-5level %logger{32} - %msg%n </Pattern> </layout> </appender> -  + --> -  +  <appender name="CYCLIC" class="ch.qos.logback.core.read.CyclicBufferAppender"> <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> @@ -47,37 +48,43 @@ <OnMatch>DENY</OnMatch> </filter> <MaxSize>512</MaxSize> - --> - -  + --> -  +  +--> +  +  <jmxConfigurator /> - + + <root> <level value="DEBUG" /> <appender-ref ref="STDOUT" /> <appender-ref ref="FILE" /> - -  <appender-ref ref="CYCLIC" /> - --> - + + </root> </configuration>

1 0

[JIRA] Commented: (LBCLASSIC-20) Implement AsyncAppender
by Ceki Gulcu (JIRA) 15 Dec '08

15 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-20?page=com.atlassian.jira.plugin.syste… ] Ceki Gulcu commented on LBCLASSIC-20: ------------------------------------- Hello Wascally, The original request was more about file compression than AsyncAppender. In order to avoid confusing the two issues, may I please ask you to create a separate *new* issue asking for AsyncAppender? > Implement AsyncAppender > ----------------------- > > Key: LBCLASSIC-20 > URL: http://jira.qos.ch/browse/LBCLASSIC-20 > Project: logback-classic > Issue Type: Improvement > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Anders Wallgren > Assignee: Logback dev list > Priority: Minor > Fix For: 0.9.10 > > > Being able to write log files in the background is a requirement for production deployments of anything we would write on top of logback. > Bonus points for including a feature to periodically flush the output. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[JIRA] Commented: (LBCLASSIC-20) Implement AsyncAppender
by Wascally Wabbit (JIRA) 14 Dec '08

14 Dec '08

[ http://jira.qos.ch/browse/LBCLASSIC-20?page=com.atlassian.jira.plugin.syste… ] Wascally Wabbit commented on LBCLASSIC-20: ------------------------------------------ This issue has been closed but the ORIGINAL poster's request for AsyncAppender was not addressed (the second poster linked generic AsyncAppender to compression for whatever reason and looks like Ceki was addressing this poster when he closed the issue). At work,I was *this* (little space) close to recommending a migration from log4j/jul/jcl to slf4j+logback but the lack of an AsyncAppender as the original poster noted is a significant issue for use in production. We have many large applications (by usage) and custom log4j appenders that will migrate beautifully *iff* we also had AsyncAppender. So why the lack of an async decorator? Does anyone really use custom database/jms appenders without this in production for high volume? At this point, even if you've got something "internal" I'll take it! Thanks, WW > Implement AsyncAppender > ----------------------- > > Key: LBCLASSIC-20 > URL: http://jira.qos.ch/browse/LBCLASSIC-20 > Project: logback-classic > Issue Type: Improvement > Components: Other > Affects Versions: unspecified > Environment: Operating System: Windows > Platform: PC > Reporter: Anders Wallgren > Assignee: Logback dev list > Priority: Minor > Fix For: 0.9.10 > > > Being able to write log files in the background is a requirement for production deployments of anything we would write on top of logback. > Bonus points for including a feature to periodically flush the output. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

svn commit: r2079 - in logback/trunk: logback-classic/src/main/java/ch/qos/logback/classic/hoard logback-classic/src/main/java/ch/qos/logback/classic/joran logback-classic/src/main/java/ch/qos/logback/classic/spi logback-classic/src/test/input/joran/hoard logback-classic/src/test/java/ch/qos/logback/classic/hoard logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/db logback-core/src/main/java/ch/qos/logback/core/joran logback-core/src/main/java/ch/qos
by noreply.ceki＠qos.ch 12 Dec '08

12 Dec '08

Author: ceki Date: Fri Dec 12 22:05:20 2008 New Revision: 2079 Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderFactory.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardAction.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingAppender.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingJoranConfigurator.java logback/trunk/logback-classic/src/test/input/joran/hoard/ logback/trunk/logback-classic/src/test/input/joran/hoard/hoard0.xml logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/HoardingAppenderTest.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/PropertyContainer.java Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextAwareBase.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java Log: - Initial commit of HoardingAppender HoardingAppender contains other appenders which it can build dynamically depending on MDC values. The built appender is specified as part of a configuration file. Here is an example. <configuration debug="true"> <appender name="HOARD" class="ch.qos.logback.classic.hoard.HoardingAppender"> <mdcKey>userid</mdcKey> <hoard>  <appender name="file-${userid}" class="ch.qos.logback.core.FileAppender"> <File>${userid}.log</File> <Append>true</Append> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%d [%thread] %level %logger{35} - %msg%n</Pattern> </layout> </appender> </hoard> </appender> <root level="DEBUG"> <appender-ref ref="HOARD" /> </root> </configuration> A new file appender will be built each according to the MDC value associated with the key "userid" when a logging event occurs. The above configuration file will ventilate logging into log files named after the userid. - Added PropertyContainer interface - Context interface now extends PropertyContainer - InterpretationContext implements PropertyContainer It now has a field called propertiesMap which has precedence over values placed in the context - InterpretationContext.getSubstitutionProperty was renamed as getProperty - It is now possible to initialize a joran Interpreter with an initial (not empty) pattern This is still very much ongoing work. Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderFactory.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/AppenderFactory.java Fri Dec 12 22:05:20 2008 @@ -0,0 +1,49 @@ +package ch.qos.logback.classic.hoard; + +import java.util.ArrayList; +import java.util.List; + +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.joran.event.SaxEvent; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; + +public class AppenderFactory { + + final List<SaxEvent> eventList; + Context context; + + AppenderFactory(Context context, List<SaxEvent> eventList) { + this.context = context; + this.eventList = new ArrayList<SaxEvent>(eventList); + removeHoardElement(); + + } + + void removeHoardElement() { + eventList.remove(0); + eventList.remove(eventList.size() - 1); + System.out.println(eventList); + } + + Appender<LoggingEvent> buildAppender(Context context, String mdcKey, + String mdcValue) throws JoranException { + //HoardingContext hoardingContext = new HoardingContext(context, mdcKey, + // mdcValue); + HoardingJoranConfigurator hjc = new HoardingJoranConfigurator(mdcKey, mdcValue); + hjc.setContext(context); + + hjc.doConfigure(eventList); + + StatusPrinter.print(context); + + return hjc.getAppender(); + } + + public List<SaxEvent> getEventList() { + return eventList; + } + +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardAction.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardAction.java Fri Dec 12 22:05:20 2008 @@ -0,0 +1,47 @@ +package ch.qos.logback.classic.hoard; + +import java.util.ArrayList; +import java.util.List; + +import org.xml.sax.Attributes; + +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.event.InPlayListener; +import ch.qos.logback.core.joran.event.SaxEvent; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.joran.spi.InterpretationContext; + +public class HoardAction extends Action implements InPlayListener { + List<SaxEvent> seList; + + @Override + public void begin(InterpretationContext ec, String name, Attributes attributes) + throws ActionException { + seList = new ArrayList<SaxEvent>(); + ec.addInPlayListener(this); + } + + @Override + public void end(InterpretationContext ec, String name) throws ActionException { + ec.removeInPlayListener(this); + Object o = ec.peekObject(); + if (o instanceof HoardingAppender) { + HoardingAppender ha = (HoardingAppender) o; + AppenderFactory appenderFactory = new AppenderFactory(context, seList); + ha.setAppenderFactory(appenderFactory); + } + } + + public void inPlay(SaxEvent event) { + seList.add(event); + System.out.println(event); + } + + public List<SaxEvent> getSeList() { + return seList; + } + + + + +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingAppender.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingAppender.java Fri Dec 12 22:05:20 2008 @@ -0,0 +1,59 @@ +package ch.qos.logback.classic.hoard; + +import java.util.Hashtable; +import java.util.Map; + +import org.slf4j.MDC; + +import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.UnsynchronizedAppenderBase; +import ch.qos.logback.core.joran.spi.JoranException; + +public class HoardingAppender extends UnsynchronizedAppenderBase<LoggingEvent> { + + static String DEFAULT = "default"; + + Map<String, Appender<LoggingEvent>> appenderMap = new Hashtable<String, Appender<LoggingEvent>>(); + + String mdcKey; + + AppenderFactory appenderFactory; + + void setAppenderFactory(AppenderFactory appenderFactory) { + this.appenderFactory = appenderFactory; + } + + + + @Override + protected void append(LoggingEvent loggingEvent) { + String mdcValue = MDC.get(mdcKey); + + if (mdcValue == null) { + mdcValue = DEFAULT; + } + + Appender<LoggingEvent> appender = appenderMap.get(mdcValue); + + if (appender == null) { + try { + appender = appenderFactory.buildAppender(context, mdcKey, mdcValue); + } catch (JoranException e) { + addError("Failed to build appender for " + mdcKey + "=" + mdcValue, e); + return; + } + } + appender.doAppend(loggingEvent); + } + + public String getMdcKey() { + return mdcKey; + } + + public void setMdcKey(String mdcKey) { + this.mdcKey = mdcKey; + } + + +} Added: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingJoranConfigurator.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/hoard/HoardingJoranConfigurator.java Fri Dec 12 22:05:20 2008 @@ -0,0 +1,64 @@ +package ch.qos.logback.classic.hoard; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +import ch.qos.logback.core.Appender; +import ch.qos.logback.core.joran.GenericConfigurator; +import ch.qos.logback.core.joran.action.ActionConst; +import ch.qos.logback.core.joran.action.AppenderAction; +import ch.qos.logback.core.joran.action.NestedBasicPropertyIA; +import ch.qos.logback.core.joran.action.NestedComplexPropertyIA; +import ch.qos.logback.core.joran.spi.Interpreter; +import ch.qos.logback.core.joran.spi.Pattern; +import ch.qos.logback.core.joran.spi.RuleStore; + +public class HoardingJoranConfigurator extends GenericConfigurator { + + String key; + String value; + + HoardingJoranConfigurator(String key, String value) { + this.key = key; + this.value = value; + } + @Override + protected Pattern initialPattern() { + return new Pattern("configuration"); + } + + @Override + protected void addImplicitRules(Interpreter interpreter) { + NestedComplexPropertyIA nestedComplexIA = new NestedComplexPropertyIA(); + nestedComplexIA.setContext(context); + interpreter.addImplicitAction(nestedComplexIA); + + NestedBasicPropertyIA nestedSimpleIA = new NestedBasicPropertyIA(); + nestedSimpleIA.setContext(context); + interpreter.addImplicitAction(nestedSimpleIA); + } + + @Override + protected void addInstanceRules(RuleStore rs) { + rs.addRule(new Pattern("configuration/appender"), new AppenderAction()); + } + + @Override + protected void buildInterpreter() { + super.buildInterpreter(); + Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap(); + omap.put(ActionConst.APPENDER_BAG, new HashMap()); + omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap()); + Map<String, String> propertiesMap = new HashMap<String, String>(); + propertiesMap.put(key, value); + interpreter.setInterpretationContextPropertiesMap(propertiesMap); + } + + public Appender getAppender() { + Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap(); + HashMap map = (HashMap) omap.get(ActionConst.APPENDER_BAG); + Collection values = map.values(); + return (Appender) values.iterator().next(); + } +} Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java Fri Dec 12 22:05:20 2008 @@ -10,6 +10,7 @@ package ch.qos.logback.classic.joran; +import ch.qos.logback.classic.hoard.HoardAction; import ch.qos.logback.classic.joran.action.ConfigurationAction; import ch.qos.logback.classic.joran.action.ConsolePluginAction; import ch.qos.logback.classic.joran.action.ContextNameAction; @@ -25,6 +26,7 @@ import ch.qos.logback.core.joran.action.AppenderRefAction; import ch.qos.logback.core.joran.action.IncludeAction; import ch.qos.logback.core.joran.action.MatcherAction; +import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.joran.spi.RuleStore; @@ -51,6 +53,10 @@ rs.addRule(new Pattern("*/evaluator/matcher"), new MatcherAction()); + rs.addRule(new Pattern("configuration/appender/hoard"), new HoardAction()); + rs.addRule(new Pattern("configuration/appender/hoard/*"), new NOPAction()); + + rs.addRule(new Pattern("configuration/logger"), new LoggerAction()); rs.addRule(new Pattern("configuration/logger/level"), new LevelAction()); Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextAwareBase.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextAwareBase.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextAwareBase.java Fri Dec 12 22:05:20 2008 @@ -1,11 +1,11 @@ /** - * LOGBack: the reliable, fast and flexible logging library for Java. - * - * Copyright (C) 1999-2006, QOS.ch - * - * This library is free software, you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation. + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. */ package ch.qos.logback.classic.spi; Added: logback/trunk/logback-classic/src/test/input/joran/hoard/hoard0.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/joran/hoard/hoard0.xml Fri Dec 12 22:05:20 2008 @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="true"> + + <appender name="HOARD" + class="ch.qos.logback.classic.hoard.HoardingAppender"> + + <mdcKey>userid</mdcKey> + + + <hoard> + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <File>${userid}.log</File> + <Append>true</Append> + <layout class="ch.qos.logback.classic.PatternLayout"> + <Pattern>%d [%thread] %level %logger{35} - %msg%n</Pattern> + </layout> + </appender> + </hoard> + + </appender> + + <root level="DEBUG"> + <appender-ref ref="HOARD" /> + </root> + +</configuration> Added: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/HoardingAppenderTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/hoard/HoardingAppenderTest.java Fri Dec 12 22:05:20 2008 @@ -0,0 +1,44 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2008, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.classic.hoard; + +import org.junit.Test; + +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.classic.util.TeztConstants; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.util.StatusPrinter; + +public class HoardingAppenderTest { + + static String PREFIX = TeztConstants.TEST_DIR_PREFIX + "input/joran/hoard/"; + + LoggerContext loggerContext = new LoggerContext(); + Logger logger = loggerContext.getLogger(this.getClass().getName()); + Logger root = loggerContext.getLogger(LoggerContext.ROOT_NAME); + + void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(loggerContext); + jc.doConfigure(file); + } + + + @Test + public void testLevel() throws JoranException { + configure(PREFIX + "hoard0.xml"); + logger.debug("ss"); + //StatusPrinter.print(loggerContext); + + } + +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/Context.java Fri Dec 12 22:05:20 2008 @@ -9,10 +9,11 @@ */ package ch.qos.logback.core; +import ch.qos.logback.core.spi.PropertyContainer; import ch.qos.logback.core.status.StatusManager; -public interface Context { +public interface Context extends PropertyContainer { StatusManager getStatusManager(); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/db/BindDataSourceToJNDIAction.java Fri Dec 12 22:05:20 2008 @@ -40,7 +40,7 @@ */ public void begin( InterpretationContext ec, String localName, Attributes attributes) { - String dsClassName = ec.getSubstitutionProperty(DATA_SOURCE_CLASS); + String dsClassName = ec.getProperty(DATA_SOURCE_CLASS); if (OptionHelper.isEmpty(dsClassName)) { addWarn("dsClassName is a required parameter"); @@ -49,9 +49,9 @@ return; } - String urlStr = ec.getSubstitutionProperty(URL); - String userStr = ec.getSubstitutionProperty(USER); - String passwordStr = ec.getSubstitutionProperty(PASSWORD); + String urlStr = ec.getProperty(URL); + String userStr = ec.getProperty(USER); + String passwordStr = ec.getProperty(PASSWORD); try { DataSource ds = Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java Fri Dec 12 22:05:20 2008 @@ -24,6 +24,7 @@ import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.Interpreter; import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.joran.spi.RuleStore; import ch.qos.logback.core.joran.spi.SimpleRuleStore; import ch.qos.logback.core.spi.ContextAwareBase; @@ -78,10 +79,14 @@ abstract protected void addImplicitRules(Interpreter interpreter); + protected Pattern initialPattern() { + return new Pattern(); + } + protected void buildInterpreter() { RuleStore rs = new SimpleRuleStore(context); addInstanceRules(rs); - this.interpreter = new Interpreter(context, rs); + this.interpreter = new Interpreter(context, rs, initialPattern()); InterpretationContext ec = interpreter.getInterpretationContext(); ec.setContext(context); addImplicitRules(interpreter); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java Fri Dec 12 22:05:20 2008 @@ -64,7 +64,7 @@ // remove the <included> tag from the beginning and </included> from the end trimHeadAndTail(recorder); - ec.getJoranInterpreter().addEvents(recorder.saxEventList); + ec.getJoranInterpreter().addEventsDynamically(recorder.saxEventList); } private boolean checkAttributes(Attributes attributes) { Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java Fri Dec 12 22:05:20 2008 @@ -51,7 +51,7 @@ } } - public void addEvents(List<SaxEvent> eventList) { + public void addEventsDynamically(List<SaxEvent> eventList) { this.eventList.addAll(currentIndex+2, eventList); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java Fri Dec 12 22:05:20 2008 @@ -24,30 +24,38 @@ import ch.qos.logback.core.joran.event.InPlayListener; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.spi.ContextAwareBase; +import ch.qos.logback.core.spi.PropertyContainer; import ch.qos.logback.core.util.OptionHelper; - /** * * An InterpretationContext contains the contextual state of a Joran parsing - * session. {@link Action} objects depend on this context to exchange - * and store information. + * session. {@link Action} objects depend on this context to exchange and store + * information. * * @author Ceki Gülcü */ -public class InterpretationContext extends ContextAwareBase { +public class InterpretationContext extends ContextAwareBase implements + PropertyContainer { Stack<Object> objectStack; Map<String, Object> objectMap; + Map<String, String> propertiesMap; + Interpreter joranInterpreter; final List<InPlayListener> listenerList = new ArrayList<InPlayListener>(); - + public InterpretationContext(Context context, Interpreter joranInterpreter) { this.context = context; this.joranInterpreter = joranInterpreter; - objectStack = new Stack<Object> (); + objectStack = new Stack<Object>(); objectMap = new HashMap<String, Object>(5); + propertiesMap = new HashMap<String, String>(5); } - + + void setPropertiesMap(Map<String, String> propertiesMap) { + this.propertiesMap = propertiesMap; + } + String updateLocationInfo(String msg) { Locator locator = joranInterpreter.getLocator(); @@ -57,7 +65,7 @@ return msg; } } - + public Locator getLocator() { return joranInterpreter.getLocator(); } @@ -135,31 +143,40 @@ } } - public String getSubstitutionProperty(String key) { - return context.getProperty(key); + /** + * If a key is found in propertiesMap then return it. Otherwise, delegate to + * the context. + */ + public String getProperty(String key) { + String v = propertiesMap.get(key); + if (v != null) { + return v; + } else { + return context.getProperty(key); + } } public String subst(String value) { if (value == null) { return null; } - return OptionHelper.substVars(value, context); + return OptionHelper.substVars(value, this); } - + public void addInPlayListener(InPlayListener ipl) { - if(listenerList.contains(ipl)) { - addWarn("InPlayListener "+ipl+" has been already registered"); + if (listenerList.contains(ipl)) { + addWarn("InPlayListener " + ipl + " has been already registered"); } else { listenerList.add(ipl); } } - + public boolean removeInPlayListener(InPlayListener ipl) { return listenerList.remove(ipl); } - + void fireInPlay(SaxEvent event) { - for(InPlayListener ipl: listenerList) { + for (InPlayListener ipl : listenerList) { ipl.inPlay(event); } } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java Fri Dec 12 22:05:20 2008 @@ -12,6 +12,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.Stack; import java.util.Vector; @@ -64,7 +65,7 @@ private static List EMPTY_LIST = new Vector(0); final private RuleStore ruleStore; - final private InterpretationContext ec; + final private InterpretationContext interpretationContext; final private ArrayList<ImplicitAction> implicitActions; final private CAI_WithLocatorSupport cai; Pattern pattern; @@ -87,18 +88,20 @@ */ Pattern skip = null; - public Interpreter(Context context, RuleStore rs) { + public Interpreter(Context context, RuleStore rs, Pattern initialPattern) { this.cai = new CAI_WithLocatorSupport(this); this.cai.setContext(context); ruleStore = rs; - ec = new InterpretationContext(context, this); + interpretationContext = new InterpretationContext(context, this); implicitActions = new ArrayList<ImplicitAction>(3); - pattern = new Pattern(); + this.pattern = initialPattern; actionListStack = new Stack<List>(); player = new EventPlayer(this); } - + public void setInterpretationContextPropertiesMap(Map<String, String> propertiesMap) { + interpretationContext.setPropertiesMap(propertiesMap); + } /** * @deprecated replaced by {@link #getInterpretationContext()} */ @@ -107,7 +110,7 @@ } public InterpretationContext getInterpretationContext() { - return ec; + return interpretationContext; } public void startDocument() { @@ -241,7 +244,7 @@ // logger.debug("set of applicable patterns: " + applicableActionList); if (applicableActionList == null) { - applicableActionList = lookupImplicitAction(pattern, attributes, ec); + applicableActionList = lookupImplicitAction(pattern, attributes, interpretationContext); } return applicableActionList; @@ -259,7 +262,7 @@ // now let us invoke the action. We catch and report any eventual // exceptions try { - action.begin(ec, tagName, atts); + action.begin(interpretationContext, tagName, atts); } catch (ActionException e) { skip = (Pattern) pattern.clone(); cai.addError("ActionException in Action for tag [" + tagName + "]", e); @@ -279,7 +282,7 @@ while (i.hasNext()) { Action action = (Action) i.next(); try { - action.body(ec, body); + action.body(interpretationContext, body); } catch (ActionException ae) { cai .addError("Exception in end() methd for action [" + action + "]", @@ -301,7 +304,7 @@ // now let us invoke the end method of the action. We catch and report // any eventual exceptions try { - action.end(ec, tagName); + action.end(interpretationContext, tagName); } catch (ActionException ae) { // at this point endAction, there is no point in skipping children as // they have been already processed @@ -321,9 +324,9 @@ player.play(eventList); } - public void addEvents(List<SaxEvent> eventList) { + public void addEventsDynamically(List<SaxEvent> eventList) { if (player != null) { - player.addEvents(eventList); + player.addEventsDynamically(eventList); } } } Added: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/PropertyContainer.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/spi/PropertyContainer.java Fri Dec 12 22:05:20 2008 @@ -0,0 +1,6 @@ +package ch.qos.logback.core.spi; + +public interface PropertyContainer { + + public String getProperty(String key); +} Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/util/OptionHelper.java Fri Dec 12 22:05:20 2008 @@ -14,6 +14,7 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.spi.PropertyContainer; /** * @author Ceki Gulcu @@ -125,7 +126,7 @@ * @throws IllegalArgumentException * if <code>val</code> is malformed. */ - public static String substVars(String val, Context context) { + public static String substVars(String val, PropertyContainer pc) { StringBuffer sbuf = new StringBuffer(); @@ -167,7 +168,7 @@ String replacement = null; // first try the props passed as parameter - replacement = context.getProperty(key); + replacement = pc.getProperty(key); // then try in System properties if (replacement == null) { @@ -186,7 +187,7 @@ // where the properties are // x1=p1 // x2=${x1} - String recursiveReplacement = substVars(replacement, context); + String recursiveReplacement = substVars(replacement, pc); sbuf.append(recursiveReplacement); } else { // if we could not find a replacement, then signal the error Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java Fri Dec 12 22:05:20 2008 @@ -43,7 +43,7 @@ atts.setValue("name", "v1"); atts.setValue("value", "work"); spAction.begin(ec, null, atts); - assertEquals("work", ec.getSubstitutionProperty("v1")); + assertEquals("work", ec.getProperty("v1")); } @Test @@ -52,7 +52,7 @@ atts.setValue("name", "v1"); atts.setValue("value", "${w}k"); spAction.begin(ec, null, atts); - assertEquals("work", ec.getSubstitutionProperty("v1")); + assertEquals("work", ec.getProperty("v1")); } @Test @@ -93,24 +93,24 @@ context.putProperty("STEM", Constants.TEST_DIR_PREFIX + "input/joran"); atts.setValue("file", "${STEM}/propertyActionTest.properties"); spAction.begin(ec, null, atts); - assertEquals("tata", ec.getSubstitutionProperty("v1")); - assertEquals("toto", ec.getSubstitutionProperty("v2")); + assertEquals("tata", ec.getProperty("v1")); + assertEquals("toto", ec.getProperty("v2")); } @Test public void testLoadFile() { atts.setValue("file", Constants.TEST_DIR_PREFIX + "input/joran/propertyActionTest.properties"); spAction.begin(ec, null, atts); - assertEquals("tata", ec.getSubstitutionProperty("v1")); - assertEquals("toto", ec.getSubstitutionProperty("v2")); + assertEquals("tata", ec.getProperty("v1")); + assertEquals("toto", ec.getProperty("v2")); } @Test public void testLoadResource() { atts.setValue("resource", "asResource/joran/propertyActionTest.properties"); spAction.begin(ec, null, atts); - assertEquals("tata", ec.getSubstitutionProperty("r1")); - assertEquals("toto", ec.getSubstitutionProperty("r2")); + assertEquals("tata", ec.getProperty("r1")); + assertEquals("toto", ec.getProperty("r2")); } @Test @@ -118,8 +118,8 @@ context.putProperty("STEM", "asResource/joran"); atts.setValue("resource", "${STEM}/propertyActionTest.properties"); spAction.begin(ec, null, atts); - assertEquals("tata", ec.getSubstitutionProperty("r1")); - assertEquals("toto", ec.getSubstitutionProperty("r2")); + assertEquals("tata", ec.getProperty("r1")); + assertEquals("toto", ec.getProperty("r2")); } @Test

1 0