December 2010 - logback-dev

[JIRA] Created: (LBCORE-187) TimestampAction should base current time on LoggerContext birthtime field
by Ceki Gulcu (JIRA) 17 Jan '11

17 Jan '11

TimestampAction should base current time on LoggerContext birthtime field ------------------------------------------------------------------------- Key: LBCORE-187 URL: http://jira.qos.ch/browse/LBCORE-187 Project: logback-core Issue Type: Bug Affects Versions: 0.9.26 Reporter: Ceki Gulcu Assignee: Logback dev list As things stand currently, TimestampAction uses the date of invocation of the config file as the value to format and place as a property. Under certain circumstances, it might be useful to take the context's birth date as input value. -- 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 4

[JIRA] Created: (LBSITE-38) Reference the configuration chapter from onJoran and vice versa
by Ceki Gulcu (JIRA) 11 Jan '11

11 Jan '11

Reference the configuration chapter from onJoran and vice versa --------------------------------------------------------------- Key: LBSITE-38 URL: http://jira.qos.ch/browse/LBSITE-38 Project: logback-site Issue Type: Task Components: Documentation Reporter: Ceki Gulcu Assignee: Logback dev list The onJoran chapter provides low level details about joran and the configuration chapter shows usage of joran. each chapter should reference the other for completeness. -- 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

2 1

[JIRA] Created: (LBCORE-189) DBAppender swallow NullPointerException
by Artyom Kalita (JIRA) 30 Dec '10

30 Dec '10

DBAppender swallow NullPointerException --------------------------------------- Key: LBCORE-189 URL: http://jira.qos.ch/browse/LBCORE-189 Project: logback-core Issue Type: Bug Components: Appender Affects Versions: 0.9.26 Reporter: Artyom Kalita Assignee: Logback dev list Priority: Minor logback.xml : <appender name="DB" class="ch.qos.logback.classic.db.DBAppender"> <connectionSource class="ch.qos.logback.core.db.DataSourceConnectionSource"> <dataSource class ="com.mchange.v2.c3p0.ComboPooledDataSource"></dataSource> <driverClass>com.mysql.jdbc.Driver</driverClass> <url>jdbc:mysql://localhost:3306/mrb</url> <user>root</user> <password>admin</password> </connectionSource> </appender> Java code (using DBAppender): Date dateFrom = null; log.info("Processing code {}; code type is {}; request date {}; record from date {}",new Object[] { code, codeType, new Date(), dateFrom }); DBAppender had null pointer exception on 141 line because of dateFrom, but this exception is swallowed and not shown. -- 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

2 3

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-7-gb8790fc
by git-noreply＠pixie.qos.ch 30 Dec '10

30 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via b8790fc09eee12d16dcc0c8417df7d503927211f (commit) from 9fa097d645fe31bb057884c21c20f3e40617a8bd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=b8790fc09eee12d16dcc0c84… http://github.com/ceki/logback/commit/b8790fc09eee12d16dcc0c8417df7d5039272… commit b8790fc09eee12d16dcc0c8417df7d503927211f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Dec 30 16:59:07 2010 +0100 FIX BCLASSIC-239 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java index 0bbc74e..93e0c13 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java @@ -138,7 +138,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { int arrayLen = argArray != null ? argArray.length : 0; for(int i = 0; i < arrayLen && i < 4; i++) { - stmt.setString(ARG0_INDEX+i, truncateTo254(argArray[i].toString())); + stmt.setString(ARG0_INDEX+i, asStringTruncatedTo254(argArray[i])); } if(arrayLen < 4) { for(int i = arrayLen; i < 4; i++) { @@ -147,7 +147,12 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { } } - String truncateTo254(String s) { + String asStringTruncatedTo254(Object o) { + String s = null; + if(o != null) { + s= o.toString(); + } + if(s == null) { return null; } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java index f8daa42..f2a3606 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/db/DBAppenderH2Test.java @@ -20,6 +20,7 @@ import static org.junit.Assert.fail; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; +import java.util.Date; import java.util.Map; import org.apache.log4j.MDC; @@ -36,7 +37,7 @@ import ch.qos.logback.core.db.DriverManagerConnectionSource; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.StatusPrinter; -public class DBAppenderH2Test { +public class DBAppenderH2Test { LoggerContext lc; Logger logger; @@ -44,13 +45,13 @@ public class DBAppenderH2Test { DriverManagerConnectionSource connectionSource; DBAppenderH2TestFixture dbAppenderH2TestFixture; int diff = RandomUtil.getPositiveInt(); - + @Before public void setUp() throws SQLException { dbAppenderH2TestFixture = new DBAppenderH2TestFixture(); dbAppenderH2TestFixture.setUp(); - + lc = new LoggerContext(); lc.setName("default"); logger = lc.getLogger("root"); @@ -61,16 +62,16 @@ public class DBAppenderH2Test { connectionSource.setContext(lc); connectionSource.setDriverClass(DBAppenderH2TestFixture.H2_DRIVER_CLASS); connectionSource.setUrl(dbAppenderH2TestFixture.url); - System.out.println("cs.url="+dbAppenderH2TestFixture.url); + System.out.println("cs.url=" + dbAppenderH2TestFixture.url); connectionSource.setUser(dbAppenderH2TestFixture.user); connectionSource.setPassword(dbAppenderH2TestFixture.password); - + connectionSource.start(); appender.setConnectionSource(connectionSource); appender.start(); } - + @After public void tearDown() throws SQLException { logger = null; @@ -85,9 +86,9 @@ public class DBAppenderH2Test { ILoggingEvent event = createLoggingEvent(); appender.append(event); - + StatusPrinter.print(lc); - + Statement stmt = connectionSource.getConnection().createStatement(); ResultSet rs = null; rs = stmt.executeQuery("SELECT * FROM logging_event"); @@ -106,11 +107,11 @@ public class DBAppenderH2Test { } else { fail("No row was inserted in the database"); } - + rs.close(); stmt.close(); } - + @Test public void testAppendThrowable() throws SQLException { ILoggingEvent event = createLoggingEvent(); @@ -121,29 +122,47 @@ public class DBAppenderH2Test { rs.next(); String expected = "java.lang.Exception: test Ex"; String firstLine = rs.getString(3); - assertTrue("["+firstLine+"] does not match ["+expected+"]", firstLine.contains(expected)); - + assertTrue("[" + firstLine + "] does not match [" + expected + "]", firstLine.contains(expected)); + int i = 0; while (rs.next()) { expected = event.getThrowableProxy().getStackTraceElementProxyArray()[i].toString(); String st = rs.getString(3); - assertTrue("["+st+"] does not match ["+expected+"]", st.contains(expected)); + assertTrue("[" + st + "] does not match [" + expected + "]", st.contains(expected)); i++; } assertTrue(i != 0); - + rs.close(); stmt.close(); } - + + @Test + public void withNullArgument() throws SQLException { + ILoggingEvent event = createLoggingEvent("Processing code {}; code type is {}; request date {}; record from date {}", new Object[] { 1, 2, new Date(), null }); + appender.append(event); + + + Statement stmt = connectionSource.getConnection().createStatement(); + ResultSet rs = null; + rs = stmt.executeQuery("SELECT * FROM logging_event"); + if (rs.next()) { + assertEquals(event.getTimeStamp(), rs.getLong(DBAppender.TIMESTMP_INDEX)); + assertEquals(event.getFormattedMessage(), rs.getString(DBAppender.FORMATTED_MESSAGE_INDEX)); + } + + StatusPrinter.print(lc); + + } + @Test public void testContextInfo() throws SQLException { lc.putProperty("testKey1", "testValue1"); - MDC.put("k"+diff, "v"+diff); + MDC.put("k" + diff, "v" + diff); ILoggingEvent event = createLoggingEvent(); - + appender.append(event); - + Statement stmt = connectionSource.getConnection().createStatement(); ResultSet rs = null; rs = stmt.executeQuery("SELECT * FROM LOGGING_EVENT_PROPERTY WHERE EVENT_ID=1"); @@ -159,14 +178,15 @@ public class DBAppenderH2Test { rs.close(); stmt.close(); } - + + @Test public void testAppendMultipleEvents() throws SQLException { for (int i = 0; i < 10; i++) { ILoggingEvent event = createLoggingEvent(); appender.append(event); } - + Statement stmt = connectionSource.getConnection().createStatement(); ResultSet rs = null; rs = stmt.executeQuery("SELECT * FROM logging_event"); @@ -175,15 +195,22 @@ public class DBAppenderH2Test { count++; } assertEquals(10, count); - + rs.close(); stmt.close(); } - - private ILoggingEvent createLoggingEvent() { + + private ILoggingEvent createLoggingEvent(String msg, Object[] args) { ILoggingEvent le = new LoggingEvent(this.getClass().getName(), logger, - Level.DEBUG, "test message", new Exception("test Ex"), new Integer[] {diff}); + Level.DEBUG, msg, new Exception("test Ex"), args); return le; } + + + private ILoggingEvent createLoggingEvent() { + return createLoggingEvent("test message", new Integer[]{diff}); + } + + } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 04bbcfa..57a55fb 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -35,6 +35,11 @@ start method now correctly sets the state of the instance. </p> + <p>Corrected handling of null valued arguments by DBAppender. This + fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-239">LBCLASSIC-239</a> + reported by Artyom Kalita.</p> + <hr width="80%" align="center" /> <h3>December 22nd, 2010 - Release of version 0.9.27</h3> ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/classic/db/DBAppender.java | 9 ++- .../qos/logback/classic/db/DBAppenderH2Test.java | 75 +++++++++++++------ logback-site/src/site/pages/news.html | 5 ++ 3 files changed, 63 insertions(+), 26 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-238) GEventEvaluator cannot be started
by Robert Elliot (JIRA) 30 Dec '10

30 Dec '10

GEventEvaluator cannot be started --------------------------------- Key: LBCLASSIC-238 URL: http://jira.qos.ch/browse/LBCLASSIC-238 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.27 Reporter: Robert Elliot Assignee: Logback dev list Priority: Critical GEventEvaluator is fundamentally broken, because it overrides the start() method on EventEvaluatorBase but never sets EventEvaluatorBase's started field to true, so the isStarted() method on EventEvaluatorBase always returns false resulting in EvaluatorFilter's decide method always returning NEUTRAL. -- 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

2 3

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-6-g9fa097d
by git-noreply＠pixie.qos.ch 30 Dec '10

30 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 9fa097d645fe31bb057884c21c20f3e40617a8bd (commit) from 0ee73e69b47e35deeaa9dc02d8f003d12a2f2e72 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=9fa097d645fe31bb057884c2… http://github.com/ceki/logback/commit/9fa097d645fe31bb057884c21c20f3e40617a… commit 9fa097d645fe31bb057884c21c20f3e40617a8bd Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Dec 30 15:51:48 2010 +0100 fix LBCLASSIC-238 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java index 04687e2..fc9623c 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/GEventEvaluator.java @@ -41,6 +41,7 @@ public class GEventEvaluator extends EventEvaluatorBase<ILoggingEvent> { } public void start() { + int errors = 0; if (expression == null || expression.length() == 0) { addError("Empty expression"); return; @@ -54,7 +55,7 @@ public class GEventEvaluator extends EventEvaluatorBase<ILoggingEvent> { currentPackageName = currentPackageName.replace('.', '/'); String scriptText = FileUtil.resourceAsString(this, classLoader, currentPackageName + "/EvaluatorTemplate.groovy"); - if(scriptText == null) { + if (scriptText == null) { return; } @@ -70,13 +71,17 @@ public class GEventEvaluator extends EventEvaluatorBase<ILoggingEvent> { } catch (CompilationFailedException cfe) { addError("Failed to compile expression [" + expression + "]", cfe); + errors++; } catch (Exception e) { addError("Failed to compile expression [" + expression + "]", e); + errors++; } + if (errors == 0) + super.start(); } public boolean evaluate(ILoggingEvent event) throws NullPointerException, EvaluationException { - if(delegateEvaluator == null) { + if (delegateEvaluator == null) { return false; } return delegateEvaluator.doEvaluate(event); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/GEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/GEventEvaluatorTest.java index 5fe551f..d482e92 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/GEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/GEventEvaluatorTest.java @@ -10,6 +10,7 @@ import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.boolex.EvaluationException; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.util.StatusPrinter; +import org.junit.Before; import org.junit.Test; import org.slf4j.MDC; import org.slf4j.Marker; @@ -32,6 +33,13 @@ public class GEventEvaluatorTest { Logger logger = context.getLogger(this.getClass()); Marker markerA = MarkerFactory.getMarker("A"); + GEventEvaluator gee = new GEventEvaluator(); + + @Before + public void setUp() { + gee.setContext(context); + } + LoggingEvent makeEvent(String msg) { return makeEvent(Level.DEBUG, msg, null, null); } @@ -41,8 +49,6 @@ public class GEventEvaluatorTest { } void doEvaluateAndCheck(String expression, ILoggingEvent event, boolean expected) throws EvaluationException { - GEventEvaluator gee = new GEventEvaluator(); - gee.setContext(context); gee.setExpression(expression); gee.start(); @@ -127,10 +133,16 @@ public class GEventEvaluatorTest { return (end - start) / LEN; } + + @Test + public void startMakesIsStartedReturnTrue() { + gee.setExpression("return true"); + gee.start(); + assertTrue(gee.isStarted()); + } + @Test public void perfTest() throws EvaluationException { - GEventEvaluator gee = new GEventEvaluator(); - gee.setContext(context); gee.setExpression("event.timeStamp < 100 && event.message != 'xx' "); gee.start(); diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 178c2d8..04bbcfa 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -30,6 +30,11 @@ <h3>January xx, 2011 - Release of version 0.9.28</h3> + <p>Fixed <a href="http://jira.qos.ch/browse/LBCLASSIC-238">issue + 238</a> reported by Robert Elliot. <code>GEventEvaluator</code>'s + start method now correctly sets the state of the instance. + </p> + <hr width="80%" align="center" /> <h3>December 22nd, 2010 - Release of version 0.9.27</h3> ----------------------------------------------------------------------- Summary of changes: .../logback/classic/boolex/GEventEvaluator.java | 9 +++++++-- .../classic/boolex/GEventEvaluatorTest.java | 20 ++++++++++++++++---- logback-site/src/site/pages/news.html | 5 +++++ 3 files changed, 28 insertions(+), 6 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-5-g0ee73e6
by git-noreply＠pixie.qos.ch 30 Dec '10

30 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 0ee73e69b47e35deeaa9dc02d8f003d12a2f2e72 (commit) from d66cfee00547c4ca2b309dcae5f8e905f6f0a00d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=0ee73e69b47e35deeaa9dc02… http://github.com/ceki/logback/commit/0ee73e69b47e35deeaa9dc02d8f003d12a2f2… commit 0ee73e69b47e35deeaa9dc02d8f003d12a2f2e72 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Dec 30 15:36:08 2010 +0100 temporarily abandoning attempt to parellize tests in logback-classic diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index b939132..b61e6d6 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -221,6 +221,24 @@ </plugin> <plugin> + <groupId>org.scala-tools</groupId> + <artifactId>maven-scala-plugin</artifactId> + <version>2.14.3</version> + <configuration> + <testSourceDir>src/test/scala</testSourceDir> + </configuration> + <executions> + <execution> + <id>scala-test-compile</id> + <phase>process-test-resources</phase> + <goals> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> @@ -300,7 +318,6 @@ <configuration>  <forkMode>once</forkMode> - <parallel>classes</parallel> <reportFormat>plain</reportFormat> <trimStackTrace>false</trimStackTrace> <excludes> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java index eb2ba4f..2679c2f 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SimpleSocketServer.java @@ -53,7 +53,7 @@ public class SimpleSocketServer extends Thread { private boolean closed = false; private ServerSocket serverSocket; private List<SocketNode> socketNodeList = new ArrayList<SocketNode>(); - + public static void main(String argv[]) throws Exception { int port = -1; if (argv.length == 2) { @@ -81,6 +81,7 @@ public class SimpleSocketServer extends Thread { serverSocket = new ServerSocket(port); while (!closed) { logger.info("Waiting to accept a new client."); + signalAlmostReadiness(); Socket socket = serverSocket.accept(); logger.info("Connected to client at " + socket.getInetAddress()); logger.info("Starting new socket node."); @@ -89,7 +90,6 @@ public class SimpleSocketServer extends Thread { socketNodeList.add(newSocketNode); } new Thread(newSocketNode).start(); - signalSocketNodeCreation(); } } catch (Exception e) { if(closed) { @@ -104,7 +104,7 @@ public class SimpleSocketServer extends Thread { * Signal another thread that we have established a conneciton * This is useful for testing purposes. */ - void signalSocketNodeCreation() { + void signalAlmostReadiness() { synchronized(this) { this.notifyAll(); } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java index 96f389e..f5a6f36 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/net/SocketNode.java @@ -48,7 +48,7 @@ public class SocketNode implements Runnable { ObjectInputStream ois; SocketAddress remoteSocketAddress; - static Logger logger = (Logger) LoggerFactory.getLogger(SocketNode.class); + Logger logger; boolean closed = false; SimpleSocketServer socketServer; @@ -57,6 +57,8 @@ public class SocketNode implements Runnable { this.socket = socket; remoteSocketAddress = socket.getRemoteSocketAddress(); this.context = context; + logger = context.getLogger(SocketNode.class); + try { ois = new ObjectInputStream(new BufferedInputStream(socket .getInputStream())); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java index c6723de..b050772 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerPerfTest.java @@ -44,7 +44,7 @@ public class LoggerPerfTest { @Test public void durationOfDisabledLogsWith_1_NOPFilter() { double avg = computeDurationOfDisabledLogsWith_1_NOPFilter(1, - NORMAL_RUN_LENGTH); + NORMAL_RUN_LENGTH); System.out.println("durationOfDisabledLogsWith_1_NOPFilter=" + avg); long referencePerf = 60; @@ -52,7 +52,7 @@ public class LoggerPerfTest { } double computeDurationOfDisabledLogsWith_1_NOPFilter(int numOfFilters, - long len) { + long len) { for (int i = 0; i < numOfFilters; i++) { lc.addTurboFilter(new NOPTurboFilter()); } @@ -81,6 +81,9 @@ public class LoggerPerfTest { lbLogger.setLevel(Level.OFF); for (long i = 0; i < len; i++) logger.isDebugEnabled(); + Thread.yield(); + for (long i = 0; i < len; i++) + logger.isDebugEnabled(); long start = System.nanoTime(); for (long i = 0; i < len; i++) @@ -102,6 +105,10 @@ public class LoggerPerfTest { lbLogger.setLevel(Level.OFF); for (long i = 0; i < len; i++) logger.debug("Toto"); + Thread.yield(); + for (long i = 0; i < len; i++) + logger.debug("Toto"); + Thread.yield(); long start = System.nanoTime(); for (long i = 0; i < len; i++) @@ -118,7 +125,7 @@ public class LoggerPerfTest { long referencePerf = 30; BogoPerf.assertDuration(avgDuration, referencePerf, - CoreConstants.REFERENCE_BIPS); + CoreConstants.REFERENCE_BIPS); } double computeDurationOfDisabledLog_1_Parameter(long len) { @@ -148,7 +155,7 @@ public class LoggerPerfTest { long referencePerf = 800; BogoPerf.assertDuration(avgDuration, referencePerf, - CoreConstants.REFERENCE_BIPS); + CoreConstants.REFERENCE_BIPS); } double computeDurationOfEnabledLog(long len) { @@ -201,14 +208,14 @@ public class LoggerPerfTest { double tolerance = threadCount * .125; // Very little thread contention // should occur in this test. double max = ((((double) NANOS_PER_CALL) / NANOS_IN_ONE_SEC) * iterCount) - * tolerance; + * tolerance; double serialized = (((double) NANOS_PER_CALL) / NANOS_IN_ONE_SEC) - * iterCount * threadCount; + * iterCount * threadCount; double actual = ((double) (end - start)) / NANOS_IN_ONE_SEC; System.out - .printf( - "Sleep duration: %,.4f seconds. Max expected: %,.4f seconds, Serialized: %,.4f\n", - actual, max, serialized); + .printf( + "Sleep duration: %,.4f seconds. Max expected: %,.4f seconds, Serialized: %,.4f\n", + actual, max, serialized); assertTrue("Exceeded maximum expected time.", actual < max); } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java index f4a6d32..f6bdfba 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerSerializationTest.java @@ -22,9 +22,12 @@ import java.io.ObjectOutputStream; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.slf4j.LoggerFactory; public class LoggerSerializationTest { + // force SLF4J initialization for subsequent Logger readResolce ooperaiton + org.slf4j.Logger unused = LoggerFactory.getLogger(this.getClass()); LoggerContext lc; Logger logger; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java index d3706ac..0002f04 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/html/HTMLLayoutTest.java @@ -158,6 +158,7 @@ public class HTMLLayoutTest { { Element tdElement = (Element) trElement.elements().get(1); String regex = ClassicTestConstants.NAKED_MAIN_REGEX; + System.out.println(tdElement.getText()); assertTrue(tdElement.getText().matches(regex)); } { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java index b5b6935..96059a1 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import java.util.Map; import ch.qos.logback.core.testUtil.RandomUtil; +import org.junit.Before; import org.junit.Test; import org.slf4j.MDC; import org.slf4j.Marker; @@ -40,8 +41,9 @@ public class SocketAppenderTest { static final int JOIN_OR_WAIT_TIMEOUT = 200; static final int SLEEP_AFTER_LOG = 100; - int port = 4561; int diff = RandomUtil.getPositiveInt(); + + int port = 1024+(diff%30000); String mdcKey = "key"+diff; LoggerContext lc = new LoggerContext(); @@ -51,17 +53,22 @@ public class SocketAppenderTest { private boolean includeCallerData = false; private SimpleSocketServer simpleSocketServer; + @Before + public void setUp() { + System.out.println("SocketAppenderTest, start at "+System.currentTimeMillis()+", port="+port); + } + @Test public void startFailNoRemoteHost() { SocketAppender appender = new SocketAppender(); appender.setContext(lc); - appender.setPort(123); + appender.setPort(port); appender.start(); assertEquals(1, lc.getStatusManager().getCount()); } @Test - public void recieveMessage() throws InterruptedException { + public void receiveMessage() throws InterruptedException { fireServer(); waitForServerToStart(); configureClient(); @@ -83,7 +90,7 @@ public class SocketAppenderTest { } @Test - public void recieveWithContext() throws InterruptedException { + public void receiveWithContext() throws InterruptedException { fireServer(); waitForServerToStart(); configureClient(); @@ -118,10 +125,10 @@ public class SocketAppenderTest { waitForServerToStart(); configureClient(); - Logger logger = lc.getLogger(Logger.ROOT_LOGGER_NAME); + Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); MDC.put(mdcKey, "testValue"); - logger.debug("test msg"); + root.debug("test msg"); Thread.sleep(SLEEP_AFTER_LOG); simpleSocketServer.close(); @@ -188,13 +195,13 @@ public class SocketAppenderTest { configureClient(); - Logger logger = lc.getLogger(Logger.ROOT_LOGGER_NAME); + Logger root = lc.getLogger(Logger.ROOT_LOGGER_NAME); MDC.put(mdcKey, "testValue"); - logger.debug("test msg"); + root.debug("test msg"); MDC.put(mdcKey, "updatedTestValue"); - logger.debug("test msg 2"); + root.debug("test msg 2"); Thread.sleep(SLEEP_AFTER_LOG); simpleSocketServer.close(); @@ -245,6 +252,9 @@ public class SocketAppenderTest { private void fireServer() throws InterruptedException { Logger root = serverLC.getLogger("root"); + Logger socketNodeLogger = serverLC.getLogger(SocketNode.class); + socketNodeLogger.setLevel(Level.WARN); + la.setName(LIST_APPENDER_NAME); la.setContext(serverLC); la.start(); @@ -252,6 +262,7 @@ public class SocketAppenderTest { simpleSocketServer = new SimpleSocketServer(serverLC, port); simpleSocketServer.start(); Thread.yield(); + Thread.sleep(50); } ListAppender<ILoggingEvent> getListAppender() { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/BogusClassLoader.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/BogusClassLoader.java index 361a80b..a96093d 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/BogusClassLoader.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/BogusClassLoader.java @@ -20,7 +20,7 @@ import java.net.URLClassLoader; * A trivial class loader which throws a NoClassDefFoundError if the requested * class name contains the string "Bogus". * - * @author Ceki Gülcü + * @author Ceki Gulcu */ public class BogusClassLoader extends URLClassLoader { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LocalFirstClassLoader.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LocalFirstClassLoader.java index 9a06d42..83e3ebf 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LocalFirstClassLoader.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LocalFirstClassLoader.java @@ -20,7 +20,7 @@ import java.net.URLClassLoader; * An almost trivial no fuss implementation of a class loader following the * child-first delegation model. * - * @author Ceki Gülcü + * @author Ceki Gulcu */ public class LocalFirstClassLoader extends URLClassLoader { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java index 465dec6..637e5b3 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/LoggingEventSerializationPerfTest.java @@ -95,7 +95,7 @@ public class LoggingEventSerializationPerfTest { } double rt = doLoop(builder, LOOP_LEN); System.out - .println("avetage time per logging event " + rt + " nanoseconds"); + .println("average time per logging event " + rt + " nanoseconds"); long averageSize = (long) (noos.size() / (LOOP_LEN)); System.out.println("noos size " + noos.size() + " average size=" diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index f080e50..17331fd 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -60,7 +60,7 @@ public class ReconfigureOnChangeTest { // it actually takes time for Windows to propagate file modification changes // values below 100 milliseconds can be problematic the same propagation // latency occurs in Linux but is even larger (>600 ms) - final static int DEFAULT_SLEEP_BETWEEN_UPDATES = 110; + final static int DEFAULT_SLEEP_BETWEEN_UPDATES = 210; int sleepBetweenUpdates = DEFAULT_SLEEP_BETWEEN_UPDATES; @@ -72,7 +72,7 @@ public class ReconfigureOnChangeTest { @Before public void setUp() { - System.out.println("======== TEST START"); + System.out.println("======== TEST START, time"+System.currentTimeMillis()); // take into account propagation latency occurs on Linux or Mac if (Env.isLinux() || Env.isMac()) { sleepBetweenUpdates = 950; @@ -129,8 +129,8 @@ public class ReconfigureOnChangeTest { loggerContext.getStatusManager().add( new InfoStatus("end of execution ", this)); - long expectedRreconfigurations = runnableArray[0].getCounter(); - verify(expectedRreconfigurations); + long expectedReconfigurations = runnableArray[0].getCounter(); + verify(expectedReconfigurations); } @Test @@ -170,7 +170,7 @@ public class ReconfigureOnChangeTest { int effectiveResets = checker .matchCount("Resetting and reconfiguring context"); // the number of effective resets must be equal or less than - // expectedRreconfigurations + // expectedReconfigurations assertTrue(effectiveResets <= expectedReconfigurations); // however, there should be some effective resets String failMsg = "effective=" + effectiveResets + ", expected=" diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 05eb067..9297f98 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -140,7 +140,8 @@ <excludes> <exclude>**/All*Test.java</exclude> <exclude>**/PackageTest.java</exclude> - <exclude>**/ConsoleAppenderTest.java</exclude> + <exclude>**/ConsoleAppenderTest.java</exclude> + <exclude>**/TimeBasedRollingTest.java</exclude> </excludes> </configuration> </plugin> diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java index c9d64df..684b16a 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java @@ -18,7 +18,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses( { RenameUtilTest.class, SizeBasedRollingTest.class, - TimeBasedRollingTest.class, TimeBasedRollingWithArchiveRemovalTest.class, + TimeBasedRolling2Test.class, TimeBasedRollingWithArchiveRemovalTest.class, MultiThreadedRollingTest.class, SizeAndTimeBasedFNATP_Test.class, RollingFileAppenderTest.class, diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java index 282974c..899a429 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/RenameUtilTest.java @@ -90,8 +90,8 @@ public class RenameUtilTest { filenames[0] = randomOutputDirAsStr + "test-" + sdf.format(currentTime); - // set currentTime to next second plus 50 millis - currentTime += 1000 - (currentTime % 1000) + 50; + // set currentTime to next second plus 250 millis + currentTime += 1000 - (currentTime % 1000) + 250; tbnatp.setCurrentTime(currentTime); rfa.doAppend("Hello 1"); ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 19 ++++++++++++- .../logback/classic/net/SimpleSocketServer.java | 6 ++-- .../ch/qos/logback/classic/net/SocketNode.java | 4 ++- .../ch/qos/logback/classic/LoggerPerfTest.java | 25 +++++++++++------ .../logback/classic/LoggerSerializationTest.java | 3 ++ .../qos/logback/classic/html/HTMLLayoutTest.java | 1 + .../logback/classic/net/SocketAppenderTest.java | 29 +++++++++++++------ .../qos/logback/classic/spi/BogusClassLoader.java | 2 +- .../logback/classic/spi/LocalFirstClassLoader.java | 2 +- .../spi/LoggingEventSerializationPerfTest.java | 2 +- .../classic/turbo/ReconfigureOnChangeTest.java | 10 +++--- logback-core/pom.xml | 3 +- .../ch/qos/logback/core/rolling/PackageTest.java | 2 +- .../qos/logback/core/rolling/RenameUtilTest.java | 4 +- 14 files changed, 77 insertions(+), 35 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-4-gd66cfee
by git-noreply＠pixie.qos.ch 30 Dec '10

30 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via d66cfee00547c4ca2b309dcae5f8e905f6f0a00d (commit) from 8c7ac8c165d45d2de55c7f0122a19d573717e512 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=d66cfee00547c4ca2b309dca… http://github.com/ceki/logback/commit/d66cfee00547c4ca2b309dcae5f8e905f6f0a… commit d66cfee00547c4ca2b309dcae5f8e905f6f0a00d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Dec 30 01:17:11 2010 +0100 parallelizing tests diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java index fadaec3..fa8a260 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java @@ -17,9 +17,9 @@ import ch.qos.logback.core.util.CoreTestConstants; public class ClassicTestConstants { final static public String ISO_REGEX = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}"; - final static public String NAKED_MAIN_REGEX = "([mM]ain|pool-\\d-)([Tt]hread)?"; + //pool-1-thread-47 + final static public String NAKED_MAIN_REGEX = "([mM]ain|pool-\\d-)([Tt]hread)?(-\\d{1,3})?"; - //pool-1-thread-47] final static public String MAIN_REGEX = "\\[" + NAKED_MAIN_REGEX + "\\]"; final static public String INPUT_PREFIX = "src/test/input/"; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java index 45cf3b9..b5b6935 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java @@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue; import java.util.Map; +import ch.qos.logback.core.testUtil.RandomUtil; import org.junit.Test; import org.slf4j.MDC; import org.slf4j.Marker; @@ -40,6 +41,9 @@ public class SocketAppenderTest { static final int SLEEP_AFTER_LOG = 100; int port = 4561; + int diff = RandomUtil.getPositiveInt(); + String mdcKey = "key"+diff; + LoggerContext lc = new LoggerContext(); LoggerContext serverLC = new LoggerContext(); ListAppender<ILoggingEvent> la = new ListAppender<ILoggingEvent>(); @@ -116,7 +120,7 @@ public class SocketAppenderTest { Logger logger = lc.getLogger(Logger.ROOT_LOGGER_NAME); - MDC.put("key", "testValue"); + MDC.put(mdcKey, "testValue"); logger.debug("test msg"); Thread.sleep(SLEEP_AFTER_LOG); @@ -128,7 +132,7 @@ public class SocketAppenderTest { ILoggingEvent remoteEvent = la.list.get(0); Map<String, String> MDCPropertyMap = remoteEvent.getMDCPropertyMap(); - assertEquals("testValue", MDCPropertyMap.get("key")); + assertEquals("testValue", MDCPropertyMap.get(mdcKey)); assertNull(remoteEvent.getCallerData()); } @@ -186,10 +190,10 @@ public class SocketAppenderTest { Logger logger = lc.getLogger(Logger.ROOT_LOGGER_NAME); - MDC.put("key", "testValue"); + MDC.put(mdcKey, "testValue"); logger.debug("test msg"); - MDC.put("key", "updatedTestValue"); + MDC.put(mdcKey, "updatedTestValue"); logger.debug("test msg 2"); Thread.sleep(SLEEP_AFTER_LOG); @@ -204,7 +208,7 @@ public class SocketAppenderTest { // the updated MDC property. ILoggingEvent remoteEvent = la.list.get(1); Map<String, String> MDCPropertyMap = remoteEvent.getMDCPropertyMap(); - assertEquals("updatedTestValue", MDCPropertyMap.get("key")); + assertEquals("updatedTestValue", MDCPropertyMap.get(mdcKey)); } @Test diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java index f39f1f3..fa4dd7d 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/pattern/ConverterTest.java @@ -100,6 +100,7 @@ public class ConverterTest { DynamicConverter<ILoggingEvent> converter = new ThreadConverter(); StringBuilder buf = new StringBuilder(); converter.write(buf, le); + System.out.println(buf.toString()); String regex = ClassicTestConstants.NAKED_MAIN_REGEX; assertTrue(buf.toString().matches(regex)); } ----------------------------------------------------------------------- Summary of changes: .../qos/logback/classic/ClassicTestConstants.java | 4 ++-- .../logback/classic/net/SocketAppenderTest.java | 14 +++++++++----- .../qos/logback/classic/pattern/ConverterTest.java | 1 + 3 files changed, 12 insertions(+), 7 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-3-g8c7ac8c
by git-noreply＠pixie.qos.ch 29 Dec '10

29 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 8c7ac8c165d45d2de55c7f0122a19d573717e512 (commit) from a0a585a04d230d2fd8d3f3a68c2faf40dafdabe9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=8c7ac8c165d45d2de55c7f01… http://github.com/ceki/logback/commit/8c7ac8c165d45d2de55c7f0122a19d573717e… commit 8c7ac8c165d45d2de55c7f0122a19d573717e512 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Dec 29 19:18:42 2010 +0100 trying to paralleize tests diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index ed392a5..b939132 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -296,9 +296,11 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.version}</version> <configuration>  <forkMode>once</forkMode> + <parallel>classes</parallel> <reportFormat>plain</reportFormat> <trimStackTrace>false</trimStackTrace> <excludes> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java index a84c9e2..fadaec3 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/ClassicTestConstants.java @@ -17,7 +17,10 @@ import ch.qos.logback.core.util.CoreTestConstants; public class ClassicTestConstants { final static public String ISO_REGEX = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}"; - final static public String NAKED_MAIN_REGEX = "[mM]ain(\\sThread)?"; + final static public String NAKED_MAIN_REGEX = "([mM]ain|pool-\\d-)([Tt]hread)?"; + + //pool-1-thread-47] + final static public String MAIN_REGEX = "\\[" + NAKED_MAIN_REGEX + "\\]"; final static public String INPUT_PREFIX = "src/test/input/"; final static public String JORAN_INPUT_PREFIX = INPUT_PREFIX + "joran/"; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java index 34b2ce6..2c1762f 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/PatternLayoutTest.java @@ -82,10 +82,11 @@ public class PatternLayoutTest extends AbstractPatternLayoutBaseTest<ILoggingEve String val = pl.doLayout(getEventObject()); // 2006-02-01 22:38:06,212 INFO [main] c.q.l.pattern.ConverterTest - Some // message + //2010-12-29 19:04:26,137 INFO [pool-1-thread-47] c.q.l.c.pattern.ConverterTest - Some message String regex = ISO_REGEX + " INFO " + MAIN_REGEX + " c.q.l.c.pattern.ConverterTest - Some message\\s*"; - assertTrue(val.matches(regex)); + assertTrue("val="+val, val.matches(regex)); } @Test diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 4c2f517..05eb067 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -130,13 +130,17 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> + <version>${surefire.version}</version> <configuration> <forkMode>once</forkMode> <reportFormat>plain</reportFormat> + <parallel>classes</parallel> + <trimStackTrace>false</trimStackTrace> <excludes> <exclude>**/All*Test.java</exclude> <exclude>**/PackageTest.java</exclude> + <exclude>**/ConsoleAppenderTest.java</exclude> </excludes> </configuration> </plugin> diff --git a/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java b/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java index 19c8afa..734d197 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/appender/ConsoleAppenderTest.java @@ -39,7 +39,7 @@ public class ConsoleAppenderTest extends AbstractAppenderTest<Object> { PrintStream original; @Before - public void setUp() throws Exception { + public void setUp() { original = System.out; // tee will output bytes on System out but it will also // collect them so that the output can be compared against @@ -54,7 +54,7 @@ public class ConsoleAppenderTest extends AbstractAppenderTest<Object> { } @After - public void tearDown() throws Exception { + public void tearDown() { System.setOut(original); } @@ -147,7 +147,7 @@ public class ConsoleAppenderTest extends AbstractAppenderTest<Object> { StatusChecker checker = new StatusChecker(context); //21:28:01,246 + WARN in ch.qos.logback.core.ConsoleAppender[null] - [foo] should be one of [SystemOut, SystemErr] //21:28:01,246 |-WARN in ch.qos.logback.core.ConsoleAppender[null] - Using previously set target, System.out by default. - + checker.containsMatch(Status.ERROR, "\\[foo\\] should be one of \\[SystemOut, SystemErr\\]"); } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java index da32e3f..9803c33 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java @@ -82,12 +82,14 @@ public class IncludeActionTest { int diff = RandomUtil.getPositiveInt(); + StackAction stackAction = new StackAction(); + @Before public void setUp() throws Exception { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); rulesMap.put(new Pattern("x/include"), new IncludeAction()); - rulesMap.put(new Pattern("x/stack"), new StackAction()); + rulesMap.put(new Pattern("x/stack"), stackAction); tc = new TrivialConfigurator(rulesMap); tc.setContext(context); @@ -100,7 +102,7 @@ public class IncludeActionTest { System.clearProperty(INCLUDE_KEY); System.clearProperty(SECOND_FILE_KEY); System.clearProperty(SUB_FILE_KEY); - StackAction.reset(); + //StackAction.reset(); } @Test @@ -195,7 +197,7 @@ public class IncludeActionTest { witness.push("a"); witness.push("b"); witness.push("c"); - assertEquals(witness, StackAction.stack); + assertEquals(witness, stackAction.getStack()); } @Test @@ -209,7 +211,7 @@ public class IncludeActionTest { void verifyConfig(String[] expected) { Stack<String> witness = new Stack<String>(); witness.addAll(Arrays.asList(expected)); - assertEquals(witness, StackAction.stack); + assertEquals(witness, stackAction.getStack()); } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackAction.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackAction.java index e198345..eb4701e 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackAction.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackAction.java @@ -22,19 +22,23 @@ import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.InterpretationContext; - public class StackAction extends Action { - public static Stack<String> stack = new Stack<String>(); - public void begin(InterpretationContext ec, String name, Attributes attributes) { - stack.push(attributes.getValue("name")); - } + Stack<String> stack = new Stack<String>(); + + public Stack<String> getStack() { + return stack; + } + + public void begin(InterpretationContext ec, String name, Attributes attributes) { + stack.push(attributes.getValue("name")); + } - public void end(InterpretationContext ec, String name) { - } + public void end(InterpretationContext ec, String name) { + } - static public void reset() { - stack.clear(); - } +// static public void reset() { +// stack.clear(); +// } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java index c354999..5cd9447 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java @@ -50,13 +50,15 @@ public class IfThenElseAndIncludeCompositionTest { static final String NESTED_INCLUDE_FILE = CONDITIONAL_DIR_PREFIX+"nestedInclude.xml"; static final String THEN_FILE_TO_INCLUDE = CONDITIONAL_DIR_PREFIX+"includedA.xml"; static final String ELSE_FILE_TO_INCLUDE = CONDITIONAL_DIR_PREFIX+"includedB.xml"; - + + StackAction stackAction = new StackAction(); + @Before public void setUp() throws Exception { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); - rulesMap.put(new Pattern("x/stack"), new StackAction()); + rulesMap.put(new Pattern("x/stack"), stackAction); rulesMap.put(new Pattern("*/if"), new IfAction()); rulesMap.put(new Pattern("*/if/then"), new ThenAction()); rulesMap.put(new Pattern("*/if/then/*"), new NOPAction()); @@ -72,7 +74,7 @@ public class IfThenElseAndIncludeCompositionTest { public void tearDown() throws Exception { StatusPrinter.printInCaseOfErrorsOrWarnings(context); context = null; - StackAction.reset(); + //StackAction.reset(); } @Test @@ -87,7 +89,7 @@ public class IfThenElseAndIncludeCompositionTest { void verifyConfig(String[] expected) { Stack<String> witness = new Stack<String>(); witness.addAll(Arrays.asList(expected)); - assertEquals(witness, StackAction.stack); + assertEquals(witness, stackAction.getStack()); } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java index 3a414e8..8ab6af3 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java @@ -46,12 +46,14 @@ public class IfThenElseTest { static final String CONDITIONAL_DIR_PREFIX = CoreTestConstants.JORAN_INPUT_PREFIX + "conditional/"; - + + StackAction stackAction = new StackAction(); + @Before public void setUp() throws Exception { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); - rulesMap.put(new Pattern("x/stack"), new StackAction()); + rulesMap.put(new Pattern("x/stack"), stackAction); rulesMap.put(new Pattern("*/if"), new IfAction()); rulesMap.put(new Pattern("*/if/then"), new ThenAction()); rulesMap.put(new Pattern("*/if/then/*"), new NOPAction()); @@ -65,7 +67,7 @@ public class IfThenElseTest { @After public void tearDown() throws Exception { StatusPrinter.printIfErrorsOccured(context); - StackAction.reset(); + //StackAction.reset(); } @Test @@ -107,7 +109,7 @@ public class IfThenElseTest { void verifyConfig(String[] expected) { Stack<String> witness = new Stack<String>(); witness.addAll(Arrays.asList(expected)); - assertEquals(witness, StackAction.stack); + assertEquals(witness, stackAction.getStack()); } diff --git a/pom.xml b/pom.xml index 992972d..6341755 100755 --- a/pom.xml +++ b/pom.xml @@ -32,9 +32,10 @@  <slf4j.version>1.6.1</slf4j.version> - <junit.version>4.7</junit.version> + <junit.version>4.8.2</junit.version> <janino.version>2.5.10</janino.version> - <scala.version>2.7.7</scala.version> + <scala.version>2.7.7</scala.version> + <surefire.version>2.6</surefire.version> <consolePlugin.version>1.1.0</consolePlugin.version> </properties> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 2 + .../qos/logback/classic/ClassicTestConstants.java | 5 +++- .../ch/qos/logback/classic/PatternLayoutTest.java | 3 +- logback-core/pom.xml | 4 +++ .../logback/core/appender/ConsoleAppenderTest.java | 6 ++-- .../core/joran/action/IncludeActionTest.java | 10 +++++--- .../logback/core/joran/action/ext/StackAction.java | 24 +++++++++++-------- .../IfThenElseAndIncludeCompositionTest.java | 10 +++++--- .../core/joran/conditional/IfThenElseTest.java | 10 +++++--- pom.xml | 5 ++- 10 files changed, 50 insertions(+), 29 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

How about switching build to Gradle?
by Joern Huxhorn 29 Dec '10

29 Dec '10

I've recently switched the build of sulky and Lilith from Maven to Gradle and it's a real pleasure to use. Hibernate and parts of Spring have switched, too. Take a look at http://blogs.jfrog.org/2010/07/to-build-or-not-to-be-seminar-videos.html and/or http://vimeo.com/16571738 for a nice introduction into Gradle. http://github.com/huxi/sulky contains the following 5 files: build.gradle config.gradle dependencyDefinitions.gradle projectDependencies.gradle settings.gradle build.gradle is the actual build file and simply includes dependencyDefinitions.gradle, projectDependencies.gradle and config.gradle. dependencyDefinitions.gradle contains the definitions of all external dependencies - comparable to a dependencyManagement section in a parent pom. projectDependencies.gradle contains the basic definition of the sub-modules (and should probably be renamed accordingly ;)), including the dependencies of each sub-module. config.gradle contains the actual configuration of the build, i.e. anything that isn't already handled by the default Gradle build, including everything necessary to perform a release into oss.sonatype.org maven repository. settings.gradle is a currently mandatory file that defines all sub-modules in a multi-module project. http://github.com/huxi/lilith contains the same general structures but is handling more complex tasks, e.g. sub-sub-modules, fatjar... I'm not saying that this is a perfect setup. You have much more freedom in Gradle than in Maven about the way you are structuring your build. It's merely meant as a functional example of a non-trivial multi-module project. Gradle offers major improvements in build speed (very intelligent up-to-date detection that makes clean unnecessary, vastly improved test execution) and saves a lot of time during release. In contrast to Maven you only have to change a single file instead of one pom in each sub-module. I'm currently still keeping the Maven build in place but I do this only because Gradle isn't yet supported by Sonar, something that is supposed to change with Sonar 2.6 due in february. See (and vote) http://jira.codehaus.org/browse/GRADLE-888 . I'd also like to point out that Gradle doesn't offer something like the Maven site plugin, yet. Beside that, using Gradle is pure pleasure. The switch wasn't always easy, mainly because PGP signing was still missing (so I wrote a plugin to support it ;)), but the people on the #gradle channel over at irc.codehaus.org are very, very helpful. Let me know what you think. I'd certainly offer help migrating SLF4J & Logback if needed. Cheers, Joern.

1 0