March 2008 - logback-dev - mailman3.qos.ch

svn commit: r1630 - in logback/trunk/logback-classic: src/main/java/ch/qos/logback/classic/net src/test/java/ch/qos/logback/classic/net src/test/java/ch/qos/logback/classic/net/mock stylesheets
by noreply.ceki＠qos.ch 04 Mar '08

04 Mar '08

Author: ceki Date: Tue Mar 4 21:01:52 2008 New Revision: 1630 Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/mock/MockSocketServer.java logback/trunk/logback-classic/stylesheets/ Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: - MockSocketServer is no longer needed for tests as SimpleSocketServer does the job - removing unused stylesheets directory Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java Tue Mar 4 21:01:52 2008 @@ -9,6 +9,7 @@ */ package ch.qos.logback.classic.net; +import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; @@ -23,17 +24,13 @@ * A simple {@link SocketNode} based server. * * <pre> - * Usage: java ch.qos.logback.classic.net.SimpleSocketServer port configFile - * - * where - * - * port - * - * is a part number where the server listens and - * - * configFile - * - * is an xml configuration file fed to {@link JoranConfigurator}. + * Usage: java ch.qos.logback.classic.net.SimpleSocketServer port configFile + * </pre> + * + * where port is a port number where the server listens and + * configFile is an xml configuration file fed to + * {@link JoranConfigurator}. + * * </pre> * * @author Ceki Gülcü @@ -41,36 +38,69 @@ * * @since 0.8.4 */ -public class SimpleSocketServer { +public class SimpleSocketServer extends Thread { - static Logger logger = LoggerFactory.getLogger(SimpleSocketServer.class); + Logger logger = LoggerFactory.getLogger(SimpleSocketServer.class); - static int port; + private final int port; + private final LoggerContext lc; + private boolean closed = false; + private ServerSocket serverSocket; public static void main(String argv[]) throws Exception { + int port = -1; if (argv.length == 2) { - init(argv[0], argv[1]); + port = parsePortNumber(argv[0]); } else { usage("Wrong number of arguments."); } - runServer(); + String configFile = argv[1]; + LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); + configureLC(lc, configFile); + + SimpleSocketServer sss = new SimpleSocketServer(lc, port); + sss.start(); } - static void runServer() { + public SimpleSocketServer(LoggerContext lc, int port) { + this.lc = lc; + this.port = port; + } + + public void run() { try { logger.info("Listening on port " + port); - ServerSocket serverSocket = new ServerSocket(port); - while (true) { + serverSocket = new ServerSocket(port); + while (!closed) { logger.info("Waiting to accept a new client."); Socket socket = serverSocket.accept(); logger.info("Connected to client at " + socket.getInetAddress()); logger.info("Starting new socket node."); - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); new Thread(new SocketNode(socket, lc)).start(); } } catch (Exception e) { - e.printStackTrace(); + if(closed) { + logger.info("Exception in run method for a closed server. This is expected"); + } else { + logger.error("Failure in run method", e); + } + } + } + + + public boolean isClosed() { + return closed; + } + + public void close() { + closed = true; + if (serverSocket != null) { + try { + serverSocket.close(); + } catch (IOException e) { + logger.error("Failed to close serverSocket", e); + } } } @@ -81,21 +111,22 @@ System.exit(1); } - static void init(String portStr, String configFile) throws JoranException { + static int parsePortNumber(String portStr) { try { - port = Integer.parseInt(portStr); + return Integer.parseInt(portStr); } catch (java.lang.NumberFormatException e) { e.printStackTrace(); usage("Could not interpret port number [" + portStr + "]."); + // we won't get here + return -1; } + } - if (configFile.endsWith(".xml")) { - LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory(); - JoranConfigurator configurator = new JoranConfigurator(); - lc.shutdownAndReset(); - configurator.setContext(lc); - configurator.doConfigure(configFile); - //StatusPrinter.print(lc); - } + static public void configureLC(LoggerContext lc, String configFile) + throws JoranException { + JoranConfigurator configurator = new JoranConfigurator(); + lc.shutdownAndReset(); + configurator.setContext(lc); + configurator.doConfigure(configFile); } } Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Tue Mar 4 21:01:52 2008 @@ -20,18 +20,23 @@ import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.net.mock.MockSocketServer; import ch.qos.logback.classic.spi.LoggerContextRemoteView; import ch.qos.logback.classic.spi.LoggerRemoteView; import ch.qos.logback.classic.spi.LoggingEvent; +import ch.qos.logback.core.read.ListAppender; public class SocketAppenderTest extends TestCase { - private LoggerContext lc; - private MockSocketServer mockSocketServer; - + static final String LIST_APPENDER_NAME = "la"; + int port = 4560; + LoggerContext lc = new LoggerContext(); + LoggerContext serverLC = new LoggerContext(); + ListAppender<LoggingEvent> la = new ListAppender<LoggingEvent>(); + + //private MockSocketServer mockSocketServer; + private SimpleSocketServer simpleSocketServer; + public void testStartFailNoRemoteHost() { - lc = new LoggerContext(); SocketAppender appender = new SocketAppender(); appender.setContext(lc); appender.setPort(123); @@ -45,14 +50,17 @@ Logger logger = lc.getLogger(LoggerContext.ROOT_NAME); logger.debug("test msg"); - + + Thread.sleep(100); + // Wait max 2 seconds for mock server to finish. However, it should // finish much sooner than that. - mockSocketServer.join(2000); - assertTrue(mockSocketServer.isFinished()); - assertEquals(1, mockSocketServer.getEventsList().size()); + simpleSocketServer.close(); + simpleSocketServer.join(2000); + assertTrue(simpleSocketServer.isClosed()); + assertEquals(1, la.list.size()); - LoggingEvent remoteEvent = mockSocketServer.getEventsList().get(0); + LoggingEvent remoteEvent = la.list.get(0); assertEquals("test msg", remoteEvent.getMessage()); assertEquals(Level.DEBUG, remoteEvent.getLevel()); } @@ -66,11 +74,13 @@ // Wait max 2 seconds for mock server to finish. However, it should // finish much sooner than that. - mockSocketServer.join(2000); - assertTrue(mockSocketServer.isFinished()); - assertEquals(1, mockSocketServer.getEventsList().size()); + Thread.sleep(100); + simpleSocketServer.close(); + simpleSocketServer.join(2000); + assertTrue(simpleSocketServer.isClosed()); + assertEquals(1, la.list.size()); - LoggingEvent remoteEvent = mockSocketServer.getEventsList().get(0); + LoggingEvent remoteEvent = la.list.get(0); LoggerRemoteView loggerRemoteView = remoteEvent.getLoggerRemoteView(); assertNotNull(loggerRemoteView); @@ -95,11 +105,14 @@ // Wait max 2 seconds for mock server to finish. However, it should // finish much sooner than that. - mockSocketServer.join(2000); - assertTrue(mockSocketServer.isFinished()); - assertEquals(1, mockSocketServer.getEventsList().size()); + Thread.sleep(100); + simpleSocketServer.close(); + simpleSocketServer.join(2000); + assertTrue(simpleSocketServer.isClosed()); + ListAppender<LoggingEvent> la = getListAppender(); + assertEquals(1, la.list.size()); - LoggingEvent remoteEvent = mockSocketServer.getEventsList().get(0); + LoggingEvent remoteEvent = la.list.get(0); Map<String, String> MDCPropertyMap = remoteEvent.getMDCPropertyMap(); assertEquals("testValue", MDCPropertyMap.get("key")); } @@ -113,13 +126,16 @@ Marker marker = MarkerFactory.getMarker("testMarker"); logger.debug(marker, "test msg"); + Thread.sleep(100); + // Wait max 2 seconds for mock server to finish. However, it should // finish much sooner than that. - mockSocketServer.join(2000); - assertTrue(mockSocketServer.isFinished()); - assertEquals(1, mockSocketServer.getEventsList().size()); + simpleSocketServer.close(); + simpleSocketServer.join(2000); + assertTrue(simpleSocketServer.isClosed()); + assertEquals(1, la.list.size()); - LoggingEvent remoteEvent = mockSocketServer.getEventsList().get(0); + LoggingEvent remoteEvent = la.list.get(0); assertEquals("testMarker", remoteEvent.getMarker().getName()); } @@ -135,26 +151,44 @@ MDC.put("key", "updatedTestValue"); logger.debug("test msg 2"); + Thread.sleep(100); + // Wait max 2 seconds for mock server to finish. However, it should // finish much sooner than that. - mockSocketServer.join(2000); - assertTrue(mockSocketServer.isFinished()); - assertEquals(2, mockSocketServer.getEventsList().size()); + simpleSocketServer.close(); + simpleSocketServer.join(2000); + assertTrue(simpleSocketServer.isClosed()); + ListAppender<LoggingEvent> la = getListAppender(); + + assertEquals(2, la.list.size()); // We observe the second logging event. It should provide us with // the updated MDC property. - LoggingEvent remoteEvent = mockSocketServer.getEventsList().get(1); + LoggingEvent remoteEvent = la.list.get(1); Map<String, String> MDCPropertyMap = remoteEvent.getMDCPropertyMap(); assertEquals("updatedTestValue", MDCPropertyMap.get("key")); } private void startServer(int expectedNumberOfEvents) throws InterruptedException { - mockSocketServer = new MockSocketServer(expectedNumberOfEvents); - mockSocketServer.start(); + Logger root = serverLC.getLogger("root"); + la.setName(LIST_APPENDER_NAME); + la.setContext(serverLC); + la.start(); + root.addAppender(la); + simpleSocketServer = new SimpleSocketServer(serverLC, port); + simpleSocketServer.start(); + //mockSocketServer = new MockSocketServer(expectedNumberOfEvents); + //mockSocketServer.start(); // give MockSocketServer head start Thread.sleep(100); } + + ListAppender<LoggingEvent> getListAppender() { + Logger root = serverLC.getLogger("root"); + return (ListAppender<LoggingEvent>) root.getAppender(LIST_APPENDER_NAME); + } + private void configureClient() { lc = new LoggerContext(); lc.setName("test"); @@ -163,7 +197,7 @@ SocketAppender socketAppender = new SocketAppender(); socketAppender.setContext(lc); socketAppender.setName("socket"); - socketAppender.setPort(4560); + socketAppender.setPort(port); socketAppender.setRemoteHost("localhost"); root.addAppender(socketAppender); socketAppender.start();

1 0

[Bug 133] New: MDC content is not copied to child threads
by bugzilla-daemon＠pixie.qos.ch 04 Mar '08

04 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=133 Summary: MDC content is not copied to child threads Product: logback-classic Version: unspecified Platform: All OS/Version: All Status: NEW Severity: critical Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: mfranz(a)intershop.de I havn't found neither at slf4j nor logback pages any information if a child thread inherits the MDC content of its parent thread when it is created. The log4j Javadoc of the MDC class states: "The MDC is managed on a per thread basis. A child thread automatically inherits a copy of the mapped diagnostic context of its parent." But with logback 0.9.8 the MDC is always empty for a new thread. Is there a reason for that? Within my application it only make sense if the child thread MDC is initially filled with content of the parent thread. Also for users of the log4j MDC this might be a critical issue preventing them from switching to logback. The LogbackMDCAdapter can easily be changed to achieve the inheriting feature: public class LogbackMDCAdapter implements MDCAdapter { private final InheritableThreadLocal<HashMap<String, String>> threadLocal = new InheritableThreadLocal<HashMap<String, String>>() { @Override @SuppressWarnings("unchecked") protected HashMap<String, String> childValue(HashMap<String, String> parentValue) { return (parentValue!=null) ? (HashMap<String, String>)parentValue.clone() : null; } }; ... } -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 2

svn commit: r1629 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 04 Mar '08

04 Mar '08

Author: ceki Date: Tue Mar 4 19:04:20 2008 New Revision: 1629 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Log: - fixing bug #129 see also http://bugzilla.qos.ch/show_bug.cgi?id=129\ - refactored the IncludeAction for clarity - IncludeActionTest has been enhanced to check for bug 129 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Tue Mar 4 19:04:20 2008 @@ -22,33 +22,27 @@ import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.util.StatusPrinter; -public class IncludeActionTest { +public class IncludeActionTest { final static String INCLUDE_KEY = "includeKey"; final static String SUB_FILE_KEY = "subFileKey"; final static String SECOND_FILE_KEY = "secondFileKey"; - - + Context context = new ContextBase(); TrivialConfigurator tc; static final String INCLUSION_DIR_PREFIX = "src/test/input/joran/inclusion/"; - static final String TOP_BY_FILE = INCLUSION_DIR_PREFIX - + "topByFile.xml"; - - static final String SUB_FILE = INCLUSION_DIR_PREFIX - + "subByFile.xml"; - + static final String TOP_BY_FILE = INCLUSION_DIR_PREFIX + "topByFile.xml"; + + static final String SUB_FILE = INCLUSION_DIR_PREFIX + "subByFile.xml"; + static final String MULTI_INCLUDE_BY_FILE = INCLUSION_DIR_PREFIX - + "multiIncludeByFile.xml"; - - static final String SECOND_FILE = INCLUSION_DIR_PREFIX - + "second.xml"; - - - static final String TOP_BY_URL = INCLUSION_DIR_PREFIX - + "topByUrl.xml"; + + "multiIncludeByFile.xml"; + + static final String SECOND_FILE = INCLUSION_DIR_PREFIX + "second.xml"; + + static final String TOP_BY_URL = INCLUSION_DIR_PREFIX + "topByUrl.xml"; static final String INCLUDE_BY_RESOURCE = INCLUSION_DIR_PREFIX + "topByResource.xml"; @@ -100,7 +94,7 @@ } @Test - public void testBasicURL() throws JoranException { + public void testBasicURL() throws JoranException { System.setProperty(INCLUDE_KEY, URL_TO_INCLUDE); tc.doConfigure(TOP_BY_URL); StatusPrinter.print(context); @@ -152,7 +146,7 @@ verifyConfig(1); } - + @Test public void multiInclude() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_FILE); @@ -160,9 +154,7 @@ tc.doConfigure(MULTI_INCLUDE_BY_FILE); verifyConfig(3); } - - void verifyConfig(int expected) { assertEquals(expected, IncAction.beginCount); assertEquals(expected, IncAction.endCount);

1 0

[Bug 64] New: Logback MDC context is not inherited by child threads.
by bugzilla-daemon＠pixie.qos.ch 04 Mar '08

04 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=64 Summary: Logback MDC context is not inherited by child threads. Product: logback-classic Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P1 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: bendis(a)bendis.cz As stated in the javadoc documentation, the ch.qos.logback.classic.MDC should be inherited by a child thread: "A child thread automatically inherits a copy of the mapped diagnostic context of its parent." But the context is NOT ihnerited by child threads - the context HashMap is stored in the ThreadLocal, not in the InheritableThreadLocal. Regards, Bendis -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 2

[Bug 127] New: LoggerComparator sorts incorrectly
by bugzilla-daemon＠pixie.qos.ch 04 Mar '08

04 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=127 Summary: LoggerComparator sorts incorrectly Product: logback-classic Version: unspecified Platform: All OS/Version: All Status: NEW Severity: major Priority: P2 Component: Other AssignedTo: logback-dev(a)qos.ch ReportedBy: mark_z(a)charter.net ch.qos.logback.classic.spi.LoggerComparator doesn't work as intended, because it is violating the symmetric property and contract of java.util.Comparator.compare(T, T). While Logger l1 is checked against LoggerContext.ROOT_NAME, Logger l2 also needs to be checked. Current implementation: public int compare(Logger l1, Logger l2) { if (l1.getName().equals(LoggerContext.ROOT_NAME)) { return -1; } return l1.getName().compareTo(l2.getName()); } Corrected implementation: public int compare(Logger l1, Logger l2) { if(l1.getName().equals(LoggerContext.ROOT_NAME)){ return -1; } if(l2.getName().equals(LoggerContext.ROOT_NAME)){ return 1; } return l1.getName().compareTo(l2.getName()); } -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 5

svn commit: r1628 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/joran/action main/java/ch/qos/logback/core/util test/input/joran/inclusion test/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 04 Mar '08

04 Mar '08

Author: ceki Date: Tue Mar 4 17:38:27 2008 New Revision: 1628 Added: logback/trunk/logback-core/src/test/input/joran/inclusion/multiIncludeByFile.xml logback/trunk/logback-core/src/test/input/joran/inclusion/second.xml logback/trunk/logback-core/src/test/input/joran/inclusion/subByFile.xml logback/trunk/logback-core/src/test/input/joran/inclusion/topByFile.xml - copied, changed from r1622, /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByFile.xml logback/trunk/logback-core/src/test/input/joran/inclusion/topByResource.xml - copied, changed from r1622, /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByResource.xml logback/trunk/logback-core/src/test/input/joran/inclusion/topByUrl.xml - copied, changed from r1622, /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByUrl.xml Removed: logback/trunk/logback-core/src/test/input/joran/inclusion/includeByFile.xml logback/trunk/logback-core/src/test/input/joran/inclusion/includeByResource.xml logback/trunk/logback-core/src/test/input/joran/inclusion/includeByUrl.xml 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/util/OptionHelper.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Log: - fixing bug #129 see also http://bugzilla.qos.ch/show_bug.cgi?id=129\ - refactored the IncludeAction for clarity - IncludeActionTest has been enhanced to check for bug 129 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 Tue Mar 4 17:38:27 2008 @@ -14,10 +14,10 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.util.List; import org.xml.sax.Attributes; -import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.joran.event.SaxEventRecorder; import ch.qos.logback.core.joran.spi.ActionException; @@ -32,41 +32,27 @@ private static final String FILE_ATTR = "file"; private static final String URL_ATTR = "url"; private static final String RESOURCE_ATTR = "resource"; - private SaxEventRecorder recorder = new SaxEventRecorder();; + + + private String attributeInUse; @Override public void begin(InterpretationContext ec, String name, Attributes attributes) throws ActionException { - String fileAttribute = attributes.getValue(FILE_ATTR); - String urlAttribute = attributes.getValue(URL_ATTR); - String resourceAttribute = attributes.getValue(RESOURCE_ATTR); - String attributeInUse = null; + SaxEventRecorder recorder = new SaxEventRecorder(); + + this.attributeInUse = null; - if(!checkAttributes(fileAttribute, urlAttribute, resourceAttribute)) { + if (!checkAttributes(attributes)) { return; } - InputStream in = null; - - if (!OptionHelper.isEmpty(fileAttribute)) { - attributeInUse = ec.subst(fileAttribute); - in = getInputStreamByFilePath(attributeInUse); - } - - if (!OptionHelper.isEmpty(urlAttribute)) { - attributeInUse = ec.subst(urlAttribute); - in = getInputStreamByUrl(attributeInUse); - } - - if (!OptionHelper.isEmpty(resourceAttribute)) { - attributeInUse = ec.subst(resourceAttribute); - in = getInputStreamByResource(attributeInUse); - } + InputStream in = getInputStream(ec, attributes); try { if (in != null) { - parseAndRecord(in); + parseAndRecord(in, recorder); in.close(); } } catch (JoranException e) { @@ -75,27 +61,17 @@ // called if in.close did not work } - if (recorder.saxEventList.size() == 0) { - return; - } - - // Let's remove the two <included> events before - // adding the events to the player. - SaxEvent first = recorder.saxEventList.get(0); - if (first != null && first.qName.equalsIgnoreCase(INCLUDED_TAG)) { - recorder.saxEventList.remove(0); - } - - SaxEvent last = recorder.saxEventList.get(recorder.saxEventList.size() - 1); - if (last != null && last.qName.equalsIgnoreCase(INCLUDED_TAG)) { - recorder.saxEventList.remove(recorder.saxEventList.size() - 1); - } - + // remove the <included> tag from the beginning and </included> from the end + trimHeadAndTail(recorder); + ec.getJoranInterpreter().addEvents(recorder.saxEventList); } - private boolean checkAttributes(String fileAttribute, - String urlAttribute, String resourceAttribute) { + private boolean checkAttributes(Attributes attributes) { + String fileAttribute = attributes.getValue(FILE_ATTR); + String urlAttribute = attributes.getValue(URL_ATTR); + String resourceAttribute = attributes.getValue(RESOURCE_ATTR); + int count = 0; if (!OptionHelper.isEmpty(fileAttribute)) { @@ -117,7 +93,8 @@ } else if (count == 1) { return true; } - throw new IllegalStateException("Count value ["+count+"] is not expected"); + throw new IllegalStateException("Count value [" + count + + "] is not expected"); } private InputStream getInputStreamByFilePath(String pathToFile) { @@ -163,7 +140,51 @@ return openURL(url); } - private void parseAndRecord(InputStream inputSource) throws JoranException { + InputStream getInputStream(InterpretationContext ec, Attributes attributes) { + String fileAttribute = attributes.getValue(FILE_ATTR); + String urlAttribute = attributes.getValue(URL_ATTR); + String resourceAttribute = attributes.getValue(RESOURCE_ATTR); + + if (!OptionHelper.isEmpty(fileAttribute)) { + attributeInUse = ec.subst(fileAttribute); + return getInputStreamByFilePath(attributeInUse); + } + + if (!OptionHelper.isEmpty(urlAttribute)) { + attributeInUse = ec.subst(urlAttribute); + return getInputStreamByUrl(attributeInUse); + } + + if (!OptionHelper.isEmpty(resourceAttribute)) { + attributeInUse = ec.subst(resourceAttribute); + return getInputStreamByResource(attributeInUse); + } + // given previous checkAttributes() check we cannot reach this line + throw new IllegalStateException("A input stream should have been returned"); + } + + private void trimHeadAndTail(SaxEventRecorder recorder) { + // Let's remove the two <included> events before + // adding the events to the player. + + List<SaxEvent> saxEventList = recorder.saxEventList; + + if (saxEventList.size() == 0) { + return; + } + + SaxEvent first = saxEventList.get(0); + if (first != null && first.qName.equalsIgnoreCase(INCLUDED_TAG)) { + saxEventList.remove(0); + } + + SaxEvent last = saxEventList.get(recorder.saxEventList.size() - 1); + if (last != null && last.qName.equalsIgnoreCase(INCLUDED_TAG)) { + saxEventList.remove(recorder.saxEventList.size() - 1); + } + } + + private void parseAndRecord(InputStream inputSource, SaxEventRecorder recorder) throws JoranException { recorder.setContext(context); recorder.recordEvents(inputSource); } 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 Tue Mar 4 17:38:27 2008 @@ -90,16 +90,16 @@ * * If no value could be found for the specified key in the context map, then * the system properties are searched, if that fails, then substitution defaults - * to the empty string. + * to appending "_IS_UNDEFINED" to the key name. * * - * For example, if system properties contains no value for the key + * For example, if not the context not the system properties contains no value for the key * "inexistentKey", then the call * * <pre> * String s = OptionConverter.subsVars( * "Value of inexistentKey is [${inexistentKey}]", context);</pre> - * will set <code>s</code> to "Value of inexistentKey is []". + * will set <code>s</code> to "Value of inexistentKey is [inexistentKey_IS_UNDEFINED]". * * * Nevertheless, it is possible to specify a default substitution value using @@ -108,13 +108,14 @@ * <pre> * String s = OptionConverter.subsVars("Value of key is [${key2:-val2}]", context);</pre> * will set <code>s</code> to "Value of key is [val2]" even if the "key2" - * property is unset. + * property is not set. * * * An {@link java.lang.IllegalArgumentException} is thrown if <code>val</code> * contains a start delimeter "${" which is not balanced by a stop delimeter * "}". * + * * @param val * The string on which variable substitution is performed. Added: logback/trunk/logback-core/src/test/input/joran/inclusion/multiIncludeByFile.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/multiIncludeByFile.xml Tue Mar 4 17:38:27 2008 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE x> + +<x> + <include file="${includeKey}" /> + <include file="${secondFileKey}" /> +</x> Added: logback/trunk/logback-core/src/test/input/joran/inclusion/second.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/second.xml Tue Mar 4 17:38:27 2008 @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE included> + +<included> + + <inc increment="1"/> + +</included> \ No newline at end of file Added: logback/trunk/logback-core/src/test/input/joran/inclusion/subByFile.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/subByFile.xml Tue Mar 4 17:38:27 2008 @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE included> + +<included> + <include file="${includeKey}" /> +</<included> Copied: logback/trunk/logback-core/src/test/input/joran/inclusion/topByFile.xml (from r1622, /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByFile.xml) ============================================================================== --- /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByFile.xml (original) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/topByFile.xml Tue Mar 4 17:38:27 2008 @@ -2,5 +2,5 @@ <!DOCTYPE x> <x> - <include file="${testing}" /> + <include file="${includeKey}" /> </x> Copied: logback/trunk/logback-core/src/test/input/joran/inclusion/topByResource.xml (from r1622, /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByResource.xml) ============================================================================== --- /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByResource.xml (original) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/topByResource.xml Tue Mar 4 17:38:27 2008 @@ -3,6 +3,6 @@ <x> - <include resource="${testing}" /> + <include resource="${includeKey}" /> </x> Copied: logback/trunk/logback-core/src/test/input/joran/inclusion/topByUrl.xml (from r1622, /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByUrl.xml) ============================================================================== --- /logback/trunk/logback-core/src/test/input/joran/inclusion/includeByUrl.xml (original) +++ logback/trunk/logback-core/src/test/input/joran/inclusion/topByUrl.xml Tue Mar 4 17:38:27 2008 @@ -2,5 +2,5 @@ <!DOCTYPE x> <x> - <include url="${testing}" /> + <include url="${includeKey}" /> </x> Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncAction.java Tue Mar 4 17:38:27 2008 @@ -24,6 +24,11 @@ static public int endCount; static public int errorCount; + static public void reset() { + beginCount = 0; + endCount = 0; + errorCount = 0; + } /** * Instantiates an layout of the given class and sets its name. * Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Tue Mar 4 17:38:27 2008 @@ -24,20 +24,34 @@ public class IncludeActionTest { - final static String FILE_KEY = "testing"; - + final static String INCLUDE_KEY = "includeKey"; + final static String SUB_FILE_KEY = "subFileKey"; + final static String SECOND_FILE_KEY = "secondFileKey"; + + Context context = new ContextBase(); TrivialConfigurator tc; static final String INCLUSION_DIR_PREFIX = "src/test/input/joran/inclusion/"; - static final String INCLUDE_BY_FILE = INCLUSION_DIR_PREFIX - + "includeByFile.xml"; - static final String INCLUDE_BY_URL = INCLUSION_DIR_PREFIX - + "includeByUrl.xml"; + static final String TOP_BY_FILE = INCLUSION_DIR_PREFIX + + "topByFile.xml"; + + static final String SUB_FILE = INCLUSION_DIR_PREFIX + + "subByFile.xml"; + + static final String MULTI_INCLUDE_BY_FILE = INCLUSION_DIR_PREFIX + + "multiIncludeByFile.xml"; + + static final String SECOND_FILE = INCLUSION_DIR_PREFIX + + "second.xml"; + + + static final String TOP_BY_URL = INCLUSION_DIR_PREFIX + + "topByUrl.xml"; static final String INCLUDE_BY_RESOURCE = INCLUSION_DIR_PREFIX - + "includeByResource.xml"; + + "topByResource.xml"; static final String INCLUDED_FILE = INCLUSION_DIR_PREFIX + "included.xml"; static final String URL_TO_INCLUDE = "file:./" + INCLUDED_FILE; @@ -66,19 +80,20 @@ @After public void tearDown() throws Exception { context = null; - System.clearProperty(FILE_KEY); + System.clearProperty(INCLUDE_KEY); + IncAction.reset(); } @Test public void basicFile() throws JoranException { - System.setProperty(FILE_KEY, INCLUDED_FILE); - tc.doConfigure(INCLUDE_BY_FILE); + System.setProperty(INCLUDE_KEY, INCLUDED_FILE); + tc.doConfigure(TOP_BY_FILE); verifyConfig(2); } @Test public void basicResource() throws JoranException { - System.setProperty(FILE_KEY, INCLUDED_AS_RESOURCE); + System.setProperty(INCLUDE_KEY, INCLUDED_AS_RESOURCE); tc.doConfigure(INCLUDE_BY_RESOURCE); StatusPrinter.print(context); verifyConfig(2); @@ -86,16 +101,16 @@ @Test public void testBasicURL() throws JoranException { - System.setProperty(FILE_KEY, URL_TO_INCLUDE); - tc.doConfigure(INCLUDE_BY_URL); + System.setProperty(INCLUDE_KEY, URL_TO_INCLUDE); + tc.doConfigure(TOP_BY_URL); StatusPrinter.print(context); verifyConfig(2); } @Test public void noFileFound() throws JoranException { - System.setProperty(FILE_KEY, "toto"); - tc.doConfigure(INCLUDE_BY_FILE); + System.setProperty(INCLUDE_KEY, "toto"); + tc.doConfigure(TOP_BY_FILE); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); StatusChecker sc = new StatusChecker(context.getStatusManager()); assertTrue(sc.containsException(FileNotFoundException.class)); @@ -103,8 +118,8 @@ @Test public void withCorruptFile() throws JoranException { - System.setProperty(FILE_KEY, INVALID); - tc.doConfigure(INCLUDE_BY_FILE); + System.setProperty(INCLUDE_KEY, INVALID); + tc.doConfigure(TOP_BY_FILE); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); StatusChecker sc = new StatusChecker(context.getStatusManager()); assertTrue(sc.containsException(SAXParseException.class)); @@ -112,22 +127,42 @@ @Test public void malformedURL() throws JoranException { - System.setProperty(FILE_KEY, "htp://logback.qos.ch"); - tc.doConfigure(INCLUDE_BY_URL); + System.setProperty(INCLUDE_KEY, "htp://logback.qos.ch"); + tc.doConfigure(TOP_BY_URL); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); StatusChecker sc = new StatusChecker(context.getStatusManager()); assertTrue(sc.containsException(MalformedURLException.class)); } @Test - public void testUnknownURL() throws JoranException { - System.setProperty(FILE_KEY, "http://logback2345.qos.ch"); - tc.doConfigure(INCLUDE_BY_URL); + public void unknownURL() throws JoranException { + System.setProperty(INCLUDE_KEY, "http://logback2345.qos.ch"); + tc.doConfigure(TOP_BY_URL); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); StatusChecker sc = new StatusChecker(context.getStatusManager()); assertTrue(sc.containsException(UnknownHostException.class)); } + @Test + public void nestedInclude() throws JoranException { + System.setProperty(SUB_FILE_KEY, INCLUDED_FILE); + System.setProperty(INCLUDE_KEY, SECOND_FILE); + tc.doConfigure(TOP_BY_FILE); + StatusPrinter.print(context); + verifyConfig(1); + + } + + @Test + public void multiInclude() throws JoranException { + System.setProperty(INCLUDE_KEY, INCLUDED_FILE); + System.setProperty(SECOND_FILE_KEY, SECOND_FILE); + tc.doConfigure(MULTI_INCLUDE_BY_FILE); + verifyConfig(3); + } + + + void verifyConfig(int expected) { assertEquals(expected, IncAction.beginCount); assertEquals(expected, IncAction.endCount);

1 0

[Bug 132] New: Logback manual refers to a not existing function in org.slf4j.MDC
by bugzilla-daemon＠pixie.qos.ch 04 Mar '08

04 Mar '08

http://bugzilla.qos.ch/show_bug.cgi?id=132 Summary: Logback manual refers to a not existing function in org.slf4j.MDC Product: logback-site Version: unspecified Platform: All OS/Version: All Status: NEW Severity: normal Priority: P1 Component: Documentation AssignedTo: logback-dev(a)qos.ch ReportedBy: mfranz(a)intershop.de The logback manual chapter 7 says: package org.slf4j; public class MDC { ... //Returns the keys in the MDC as a Set. The returned value can be null. public static Set<String> getKeys(); } But the method getKeys() is not part of the released slf4j API (versions 1.4.3 and 1.5.0). This method exists only within the LogbackMDCAdapter. -- Configure bugmail: http://bugzilla.qos.ch/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.

1 0

svn commit: r1627 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core/util test/java/ch/qos/logback/core/util
by noreply.ceki＠qos.ch 04 Mar '08

04 Mar '08

Author: ceki Date: Tue Mar 4 16:48:11 2008 New Revision: 1627 Modified: 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/util/OptionHelperTest.java Log: - undefined substitution variables are now marked as _IS_UNDEFINED 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 Tue Mar 4 16:48:11 2008 @@ -9,8 +9,6 @@ */ package ch.qos.logback.core.util; -import java.util.Map; - import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreGlobal; @@ -71,7 +69,8 @@ final static char DELIM_STOP = '}'; final static int DELIM_START_LEN = 2; final static int DELIM_STOP_LEN = 1; - + final static String _IS_UNDEFINED = "_IS_UNDEFINED"; + /** * Perform variable substitution in string <code>val</code> from the values * of keys found in context property map, and if that fails, then in the @@ -185,6 +184,9 @@ // x2=${x1} String recursiveReplacement = substVars(replacement, context); sbuf.append(recursiveReplacement); + } else { + // if we could not find a replacement, then signal the error + sbuf.append(key+"_IS_UNDEFINED"); } i = k + DELIM_STOP_LEN; Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/util/OptionHelperTest.java Tue Mar 4 16:48:11 2008 @@ -28,26 +28,33 @@ super.tearDown(); } - public void testSubstVarsNoSubstitution() { - String noSubst = "testing if it works"; - - String result = OptionHelper.substVars(noSubst, null); + public void testLiteral() { + String noSubst = "hello world"; + String result = OptionHelper.substVars(noSubst, context); assertEquals(noSubst, result); } - + + + public void testUndefinedValues() { + String withUndefinedValues = "${axyz}"; + + String result = OptionHelper.substVars(withUndefinedValues, context); + assertEquals("axyz"+OptionHelper._IS_UNDEFINED, result); + } + public void testSubstVarsVariableNotClosed() { String noSubst = "testing if ${v1 works"; try { @SuppressWarnings("unused") - String result = OptionHelper.substVars(noSubst, null); + String result = OptionHelper.substVars(noSubst, context); fail(); } catch (IllegalArgumentException e) { //ok } } - public void testSubstVarsPrimaryOnly() { + public void testSubstVarsContextOnly() { context.putProperty("v1", "if"); context.putProperty("v2", "works");

1 0

svn commit: r1626 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 04 Mar '08

04 Mar '08

Author: ceki Date: Tue Mar 4 15:21:26 2008 New Revision: 1626 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java Log: Converted IncludeActionTest Junit 4 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Tue Mar 4 15:21:26 2008 @@ -1,12 +1,16 @@ package ch.qos.logback.core.joran.action; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.FileNotFoundException; import java.net.MalformedURLException; import java.net.UnknownHostException; import java.util.HashMap; -import junit.framework.TestCase; - +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.xml.sax.SAXParseException; import ch.qos.logback.core.Context; @@ -18,7 +22,7 @@ import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.util.StatusPrinter; -public class IncludeActionTest extends TestCase { +public class IncludeActionTest { final static String FILE_KEY = "testing"; @@ -42,8 +46,7 @@ static final String INCLUDED_AS_RESOURCE = "input/joran/inclusion/includedAsResource.xml"; - public IncludeActionTest(String arg0) { - super(arg0); + public IncludeActionTest() { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); rulesMap.put(new Pattern("x/inc"), new IncAction()); @@ -53,34 +56,35 @@ tc.setContext(context); } - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { IncAction.beginCount = 0; IncAction.errorCount = 0; IncAction.endCount = 0; } - @Override - protected void tearDown() throws Exception { - super.tearDown(); + @After + public void tearDown() throws Exception { context = null; System.clearProperty(FILE_KEY); } - public void testBasicFile() throws JoranException { + @Test + public void basicFile() throws JoranException { System.setProperty(FILE_KEY, INCLUDED_FILE); tc.doConfigure(INCLUDE_BY_FILE); verifyConfig(2); } - public void testBasicResource() throws JoranException { + @Test + public void basicResource() throws JoranException { System.setProperty(FILE_KEY, INCLUDED_AS_RESOURCE); tc.doConfigure(INCLUDE_BY_RESOURCE); StatusPrinter.print(context); verifyConfig(2); } + @Test public void testBasicURL() throws JoranException { System.setProperty(FILE_KEY, URL_TO_INCLUDE); tc.doConfigure(INCLUDE_BY_URL); @@ -88,7 +92,8 @@ verifyConfig(2); } - public void testNoFileFound() throws JoranException { + @Test + public void noFileFound() throws JoranException { System.setProperty(FILE_KEY, "toto"); tc.doConfigure(INCLUDE_BY_FILE); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); @@ -96,7 +101,8 @@ assertTrue(sc.containsException(FileNotFoundException.class)); } - public void testWithCorruptFile() throws JoranException { + @Test + public void withCorruptFile() throws JoranException { System.setProperty(FILE_KEY, INVALID); tc.doConfigure(INCLUDE_BY_FILE); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); @@ -104,7 +110,8 @@ assertTrue(sc.containsException(SAXParseException.class)); } - public void testMalformedURL() throws JoranException { + @Test + public void malformedURL() throws JoranException { System.setProperty(FILE_KEY, "htp://logback.qos.ch"); tc.doConfigure(INCLUDE_BY_URL); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); @@ -112,6 +119,7 @@ assertTrue(sc.containsException(MalformedURLException.class)); } + @Test public void testUnknownURL() throws JoranException { System.setProperty(FILE_KEY, "http://logback2345.qos.ch"); tc.doConfigure(INCLUDE_BY_URL); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/PackageTest.java Tue Mar 4 15:21:26 2008 @@ -9,6 +9,7 @@ */ package ch.qos.logback.core.joran.action; +import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -18,7 +19,7 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(PropertyActionTest.class); - suite.addTestSuite(IncludeActionTest.class); + suite.addTest(new JUnit4TestAdapter(IncludeActionTest.class)); return suite; }

1 0

svn commit: r1625 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 04 Mar '08

04 Mar '08

Author: ceki Date: Tue Mar 4 15:09:28 2008 New Revision: 1625 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java Log: Adding LoggerComparatorTest to the PackageSuite Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/PackageTest.java Tue Mar 4 15:09:28 2008 @@ -10,6 +10,7 @@ package ch.qos.logback.classic.spi; +import junit.framework.JUnit4TestAdapter; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -19,7 +20,8 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.addTestSuite(ContextListenerTest.class); - suite.addTestSuite(CallerDataTest.class); + suite.addTestSuite(CallerDataTest.class); + suite.addTest(new JUnit4TestAdapter (LoggerComparatorTest.class)); return suite; } } \ No newline at end of file

1 0