- logback-dev - mailman3.qos.ch

[JIRA] Resolved: (LBCORE-32) Specificy the config file to use as a System property
by Ceki Gulcu (JIRA) 18 Jul '08

18 Jul '08

[ http://jira.qos.ch/browse/LBCORE-32?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu resolved LBCORE-32. ------------------------------ Fix Version/s: 0.9.10 Resolution: Fixed Fixed in revision revision=1723. > Specificy the config file to use as a System property > ----------------------------------------------------- > > Key: LBCORE-32 > URL: http://jira.qos.ch/browse/LBCORE-32 > Project: logback-core > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: All > Platform: PC > Reporter: Ted Graham > Assignee: Logback dev list > Fix For: 0.9.10 > > Attachments: log-property-config.patch, log-property-config.patch > > > I'd like to be able to specify the logger config file to use as a System property, something like: > java -Dlogback.configuration=customConfig.xml > This is a much cleaner way of controlling the config than by messing with the classpath. -- 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] Updated: (LBCORE-32) Specificy the config file to use as a System property
by Ceki Gulcu (JIRA) 18 Jul '08

18 Jul '08

[ http://jira.qos.ch/browse/LBCORE-32?page=com.atlassian.jira.plugin.system.i… ] Ceki Gulcu updated LBCORE-32: ----------------------------- Comment: was deleted > Specificy the config file to use as a System property > ----------------------------------------------------- > > Key: LBCORE-32 > URL: http://jira.qos.ch/browse/LBCORE-32 > Project: logback-core > Issue Type: Bug > Components: Other > Affects Versions: unspecified > Environment: Operating System: All > Platform: PC > Reporter: Ted Graham > Assignee: Logback dev list > Attachments: log-property-config.patch, log-property-config.patch > > > I'd like to be able to specify the logger config file to use as a System property, something like: > java -Dlogback.configuration=customConfig.xml > This is a much cleaner way of controlling the config than by messing with the classpath. -- 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: r1723 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/util test/input test/java/ch/qos/logback/classic/util test/resources
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 23:44:49 2008 New Revision: 1723 Added: logback/trunk/logback-classic/src/test/input/autoConfig.xml logback/trunk/logback-classic/src/test/resources/autoConfigAsResource.xml Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java Log: - Related to LBCORE-32 added support for passing the configuration file as a system property. The system property name is "logback.configurationFile". Values can be of type URL, a file, or a resource name. I am guessing that this modification should satisfy the requirements for most users who voted on this issue. I am not too keen on adding other config directives as system properties as suggested by M. Fowles. Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/util/ContextInitializer.java Fri Jul 18 23:44:49 2008 @@ -1,5 +1,7 @@ package ch.qos.logback.classic.util; +import java.io.File; +import java.net.MalformedURLException; import java.net.URL; import ch.qos.logback.classic.BasicConfigurator; @@ -8,10 +10,18 @@ import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.util.Loader; +// contributors +// Ted Graham, Matt Fowles, see also http://jira.qos.ch/browse/LBCORE-32 +/** + * This class contains logback's logic for automatic configuration + * + * @author Ceki Gulcu + */ public class ContextInitializer { final public static String AUTOCONFIG_FILE = "logback.xml"; final public static String TEST_AUTOCONFIG_FILE = "logback-test.xml"; + final public static String CONFIG_FILE_PROPERTY = "logback.configurationFile"; public static void configureByResource(LoggerContext loggerContext, URL url) throws JoranException { @@ -23,13 +33,39 @@ configurator.doConfigure(url); } + static URL findConfigFileURLFromSystemProperties(ClassLoader classLoader) { + String logbackConfigFile = System.getProperty(CONFIG_FILE_PROPERTY, null); + if (logbackConfigFile != null) { + try { + return new URL(logbackConfigFile); + } catch (MalformedURLException e) { + // so, resource is not a URL: + // attempt to get the resource from the class path + URL urlAsResource = Loader.getResource(logbackConfigFile, classLoader); + if (urlAsResource != null) { + return urlAsResource; + } + File f = new File(logbackConfigFile); + if (f.exists() && f.isFile()) { + try { + return f.toURL(); + } catch (MalformedURLException e1) { + } + } + } + } + return null; + } + public static void autoConfig(LoggerContext loggerContext, ClassLoader classLoader) throws JoranException { - URL url = Loader.getResource(TEST_AUTOCONFIG_FILE, classLoader); + URL url = findConfigFileURLFromSystemProperties(classLoader); + if (url == null) { + url = Loader.getResource(TEST_AUTOCONFIG_FILE, classLoader); + } if (url == null) { url = Loader.getResource(AUTOCONFIG_FILE, classLoader); } - if (url != null) { configureByResource(loggerContext, url); } else { Added: logback/trunk/logback-classic/src/test/input/autoConfig.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/input/autoConfig.xml Fri Jul 18 23:44:49 2008 @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<configuration> + + <appender name="AUTO_BY_SYSTEM_PROPERTY" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern>%msg%n"</pattern> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="AUTO_BY_SYSTEM_PROPERTY" /> + </root> +</configuration> Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/util/InitializationTest.java Fri Jul 18 23:44:49 2008 @@ -8,6 +8,7 @@ import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.core.Appender; import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.joran.spi.JoranException; public class InitializationTest extends TestCase { @@ -23,6 +24,7 @@ protected void tearDown() throws Exception { super.tearDown(); + System.clearProperty(ContextInitializer.CONFIG_FILE_PROPERTY); } public void testAutoconfig() { @@ -42,6 +44,19 @@ Appender appender = root.getAppender("STDOUT"); assertNull(appender); } + } + public void testAutoConfigFromSystemProperties() throws JoranException { + doAutoConfigFromSystemProperties(TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); + doAutoConfigFromSystemProperties("autoConfigAsResource.xml"); + // test passing a URL. note the relative path syntax with file:src/test/... + doAutoConfigFromSystemProperties("file:"+TeztConstants.TEST_DIR_PREFIX + "input/autoConfig.xml"); + } + public void doAutoConfigFromSystemProperties(String val) throws JoranException { + lc.shutdownAndReset(); + System.setProperty(ContextInitializer.CONFIG_FILE_PROPERTY, val); + ContextInitializer.autoConfig(lc); + Appender appender = root.getAppender("AUTO_BY_SYSTEM_PROPERTY"); + assertNotNull(appender); } } Added: logback/trunk/logback-classic/src/test/resources/autoConfigAsResource.xml ============================================================================== --- (empty file) +++ logback/trunk/logback-classic/src/test/resources/autoConfigAsResource.xml Fri Jul 18 23:44:49 2008 @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<configuration> + + <appender name="AUTO_BY_SYSTEM_PROPERTY" class="ch.qos.logback.core.ConsoleAppender"> + <layout class="ch.qos.logback.classic.PatternLayout"> + <pattern>%msg%n"</pattern> + </layout> + </appender> + + <root> + <level value="debug" /> + <appender-ref ref="AUTO_BY_SYSTEM_PROPERTY" /> + + </root> +</configuration>

1 0

svn commit: r1722 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:40:38 2008 New Revision: 1722 Removed: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/XConfiguratorTestX.java Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Log: make turboDymanicFilter test part of the regular build Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java Fri Jul 18 22:40:38 2008 @@ -9,6 +9,8 @@ */ package ch.qos.logback.classic.joran; +import org.slf4j.MDC; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -170,6 +172,30 @@ assertEquals("hello", back.getMessage()); } + public void testTurboDynamicThreshold() throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + LoggerContext loggerContext = new LoggerContext(); + jc.setContext(loggerContext); + jc.doConfigure(TeztConstants.TEST_DIR_PREFIX + "input/joran/turboDynamicThreshold.xml"); + + StatusPrinter.print(loggerContext.getStatusManager()); + + Logger logger = loggerContext.getLogger(this.getClass().getName()); + Logger root = loggerContext.getLogger(LoggerContext.ROOT_NAME); + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); + assertEquals(0, listAppender.list.size()); + + // this one should be denied + MDC.put("userId", "user1"); + logger.debug("hello user1"); + // this one should log + MDC.put("userId", "user2"); + logger.debug("hello user2"); + + assertEquals(1, listAppender.list.size()); + LoggingEvent le = (LoggingEvent) listAppender.list.get(0); + assertEquals("hello user2", le.getMessage()); + } public static Test suite() { TestSuite suite = new TestSuite();

1 0

svn commit: r1721 - logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:24:51 2008 New Revision: 1721 Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java Log: - renaming "test" as "tezt" as a prefix in Junit 4 tests, so that they pass under Continuum Modified: logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java ============================================================================== --- logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java (original) +++ logback/trunk/logback-access/src/test/java/ch/qos/logback/access/jetty/JettyBasicTest.java Fri Jul 18 22:24:51 2008 @@ -37,7 +37,7 @@ } @Test - public void testGetRequest() throws Exception { + public void teztGetRequest() throws Exception { URL url = new URL("http://localhost:"+ JettyFixture.PORT + "/"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoInput(true); @@ -51,7 +51,7 @@ } @Test - public void testEventGoesToAppenders() throws Exception { + public void teztEventGoesToAppenders() throws Exception { URL url = new URL("http://localhost:"+ JettyFixture.PORT + "/"); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setDoInput(true); @@ -69,7 +69,7 @@ } @Test - public void testPostContentConverter() throws Exception { + public void teztPostContentConverter() throws Exception { //System.out.println("into test"); URL url = new URL("http://localhost:"+ JettyFixture.PORT + "/"); String msg = "test message";

1 0

svn commit: r1720 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:18:39 2008 New Revision: 1720 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Log: - removing "test" as a prefix from Junit 4 tests, so that they pass under Continuum Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SyslogAppenderTest.java Fri Jul 18 22:18:39 2008 @@ -37,7 +37,7 @@ } @Test - public void testBasic() throws InterruptedException { + public void basic() throws InterruptedException { int port = MockSyslogServer.PORT + 1; MockSyslogServer mockServer = new MockSyslogServer(1, port); @@ -82,7 +82,7 @@ } @Test - public void testException() throws InterruptedException { + public void tException() throws InterruptedException { int port = MockSyslogServer.PORT + 2; MockSyslogServer mockServer = new MockSyslogServer(21, port); mockServer.start();

1 0

svn commit: r1719 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:17:42 2008 New Revision: 1719 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java Log: - removing "test" as a prefix from Junit 4 tests, so that they pass under Continuum Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationTest.java Fri Jul 18 22:17:42 2008 @@ -54,7 +54,7 @@ } @Test - public void testContext() throws Exception { + public void context() throws Exception { lc.putProperty("testKey", "testValue"); LoggingEvent event = createLoggingEvent(); LoggingEvent remoteEvent = writeAndRead(event); @@ -74,7 +74,7 @@ } @Test - public void testMDC() throws Exception { + public void MDC() throws Exception { MDC.put("key", "testValue"); LoggingEvent event = createLoggingEvent(); LoggingEvent remoteEvent = writeAndRead(event); @@ -84,7 +84,7 @@ } @Test - public void testUpdatedMDC() throws Exception { + public void updatedMDC() throws Exception { MDC.put("key", "testValue"); LoggingEvent event1 = createLoggingEvent(); oos.writeObject(event1); @@ -123,7 +123,7 @@ } @Test - public void testThrowable() throws Exception { + public void xThrowable() throws Exception { LoggingEvent event = createLoggingEvent(); Throwable throwable = new Throwable("just testing"); ThrowableInformation th = new ThrowableInformation(throwable); @@ -134,7 +134,7 @@ } @Test - public void testSerializeLargeArgs() throws Exception { + public void serializeLargeArgs() throws Exception { StringBuffer buffer = new StringBuffer(); for (int i = 0; i < 100000; i++) {

1 0

svn commit: r1718 - logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:15:22 2008 New Revision: 1718 Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: - removing "test" as a prefix from Junit 4 tests, so that they pass under Continuum 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 Fri Jul 18 22:15:22 2008 @@ -41,7 +41,7 @@ private SimpleSocketServer simpleSocketServer; @Test - public void testStartFailNoRemoteHost() { + public void startFailNoRemoteHost() { SocketAppender appender = new SocketAppender(); appender.setContext(lc); appender.setPort(123); @@ -50,7 +50,7 @@ } @Test - public void testRecieveMessage() throws InterruptedException { + public void recieveMessage() throws InterruptedException { fireServer(); configureClient(); @@ -72,7 +72,7 @@ } @Test - public void testRecieveWithContext() throws InterruptedException { + public void recieveWithContext() throws InterruptedException { fireServer(); configureClient(); @@ -102,7 +102,7 @@ } @Test - public void testMessageWithMDC() throws InterruptedException { + public void messageWithMDC() throws InterruptedException { fireServer(); configureClient(); @@ -126,7 +126,7 @@ } @Test - public void testMessageWithMarker() throws InterruptedException { + public void messageWithMarker() throws InterruptedException { fireServer(); configureClient(); @@ -149,7 +149,7 @@ } @Test - public void testMessageWithUpdatedMDC() throws InterruptedException { + public void messageWithUpdatedMDC() throws InterruptedException { fireServer(); configureClient();

1 0

svn commit: r1717 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:11:22 2008 New Revision: 1717 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Log: - apparently [1] if the test method starts with test, surefire will consider the test as junit 3.8 and will not call any methods annotated with @Before. Sigh. [1] http://mail-archives.apache.org/mod_mbox/maven-users/200705.mbox/%3C394431.… 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 Fri Jul 18 22:11:22 2008 @@ -3,11 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; -import java.io.PrintStream; -import java.io.PrintWriter; -import java.io.StringWriter; import java.net.MalformedURLException; import java.net.UnknownHostException; import java.util.HashMap; @@ -71,9 +67,7 @@ @Before public void setUp() throws Exception { - System.out.print("**** IncAction.reset"); IncAction.reset(); - System.out.print("*** after reset = "+IncAction.beginCount); } @After @@ -100,11 +94,9 @@ } @Test - public void testBasicURL() throws JoranException { - System.out.print("*** Before doConfig = "+IncAction.beginCount); + public void basicURL() throws JoranException { System.setProperty(INCLUDE_KEY, URL_TO_INCLUDE); tc.doConfigure(TOP_BY_URL); - System.out.println("*** After doConfig = "+IncAction.beginCount); StatusPrinter.print(context); verifyConfig(2); }

1 0

svn commit: r1716 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action
by noreply.ceki＠qos.ch 18 Jul '08

18 Jul '08

Author: ceki Date: Fri Jul 18 22:04:57 2008 New Revision: 1716 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java Log: last ditch attempt 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 Fri Jul 18 22:04:57 2008 @@ -71,9 +71,9 @@ @Before public void setUp() throws Exception { - System.out.println("**** Calling IncAction.reset"); + System.out.print("**** IncAction.reset"); IncAction.reset(); - System.out.println("*** after reset = "+IncAction.beginCount); + System.out.print("*** after reset = "+IncAction.beginCount); } @After @@ -101,11 +101,10 @@ @Test public void testBasicURL() throws JoranException { - System.out.print("********** in testBasicURL"); - System.out.println("Before doConfig = "+IncAction.beginCount); + System.out.print("*** Before doConfig = "+IncAction.beginCount); System.setProperty(INCLUDE_KEY, URL_TO_INCLUDE); tc.doConfigure(TOP_BY_URL); - System.out.println("After doConfig = "+IncAction.beginCount); + System.out.println("*** After doConfig = "+IncAction.beginCount); StatusPrinter.print(context); verifyConfig(2); }

1 0