August 2009 - logback-dev - mailman3.qos.ch

svn commit: r2439 - logback/trunk/logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 10 Aug '09

10 Aug '09

Author: ceki Date: Mon Aug 10 15:33:55 2009 New Revision: 2439 Modified: logback/trunk/logback-site/src/site/pages/manual/configuration.html Log: - typo fix and minor rewording Modified: logback/trunk/logback-site/src/site/pages/manual/configuration.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/configuration.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/configuration.html Mon Aug 10 15:33:55 2009 @@ -685,7 +685,7 @@ <em>logger</em> element takes exactly one mandatory <span class="attr">name</span> attribute, an optional <span class="attr">level</span> attribute, and an optional <span - class="attr">aditivity</span> attribute, which admits the values + class="attr">additivity</span> attribute, which admits the values <em>true</em> or <em>false</em>. The value of the <span class="attr">level</span> attribute can be one of the case-insensitive strings TRACE, DEBUG, INFO, WARN, ERROR, ALL or @@ -716,10 +716,10 @@ single attribute, namely the <span class="attr">level</span> attribute. It does not admit any other attributes because the additivity flag does not apply to the root logger. Moreover, since - the root logger is already named, it does not admit a name attribute - either. The value of the level attribute can be set to one of the - case-insensitive strings TRACE, DEBUG, INFO, WARN, ERROR, ALL or - OFF. Note that the level of the root logger cannot be set to + the root logger is already named as "ROOT", it does not admit a name + attribute either. The value of the level attribute can be set to one + of the case-insensitive strings TRACE, DEBUG, INFO, WARN, ERROR, ALL + or OFF. Note that the level of the root logger cannot be set to INHERITED or NULL. </p>

1 0

svn commit: r2438 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 21:52:47 2009 New Revision: 2438 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Log: - minor Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Sun Aug 9 21:52:47 2009 @@ -138,6 +138,7 @@ /** * This method differentiates RollingFileAppender from its super class. */ + @Override protected void subAppend(E event) { // The roll-over check must precede actual writing. This is the // only correct behavior for time driven triggers.

1 0

Release of logback version 0.9.17
by Ceki Gulcu 09 Aug '09

09 Aug '09

9th of August 2009 - Release of version 0.9.17 I am happy to announce the immediate availability of logback version 0.9.17. In addition to important bug fixes this release adds often requested new features. Please refer to the the news page for precise details. http://logback.qos.ch/news.html You can download logback, including full source code, class files and documentation on our download page, shown below. http://logback.qos.ch/download.html You can receive logback related announcements by subscribing to the logback announce mailing list. To subscribe to logback-announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/logback-announce Best regards, -- Ceki Gülcü Logback: The reliable, generic, fast and flexible logging framework for Java. http://logback.qos.ch

1 0

svn commit: r2437 - in logback/trunk: . logback-access logback-classic logback-core logback-examples logback-site
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 21:07:56 2009 New Revision: 2437 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-examples/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/pom.xml Log: - starting work on 0.9.18 Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Sun Aug 9 21:07:56 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17</version> + <version>0.9.18-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Sun Aug 9 21:07:56 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17</version> + <version>0.9.18-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Sun Aug 9 21:07:56 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17</version> + <version>0.9.18-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-examples/pom.xml ============================================================================== --- logback/trunk/logback-examples/pom.xml (original) +++ logback/trunk/logback-examples/pom.xml Sun Aug 9 21:07:56 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17</version> + <version>0.9.18-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Sun Aug 9 21:07:56 2009 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17</version> + <version>0.9.18-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Sun Aug 9 21:07:56 2009 @@ -5,7 +5,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17</version> + <version>0.9.18-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback-Parent</name>

1 0

svn commit: r2436 - logback/tags/release_0.9.17
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 21:06:22 2009 New Revision: 2436 Added: logback/tags/release_0.9.17/ - copied from r2435, /logback/trunk/ Log: tagging version 0.9.17

1 0

svn commit: r2435 - logback/trunk/logback-site/src/site/pages
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:58:12 2009 New Revision: 2435 Modified: logback/trunk/logback-site/src/site/pages/news.html Log: - 9th of August 2009 - Release of version 0.9.17< Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Sun Aug 9 20:58:12 2009 @@ -29,7 +29,7 @@ <hr width="80%" align="center" /> - <h3>XXX 2009 - Release of version 0.9.17</h3> + <h3>9th of August 2009 - Release of version 0.9.17</h3> <p><code>PackagingDataCalculator</code> now correctly deals with <code>NoClassDefFoundError</code> thrown by class loaders. This

1 0

svn commit: r2434 - in logback/trunk: . logback-access logback-classic logback-core logback-examples logback-site logback-site/src/site/pages
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:57:30 2009 New Revision: 2434 Modified: logback/trunk/logback-access/pom.xml logback/trunk/logback-classic/pom.xml logback/trunk/logback-core/pom.xml logback/trunk/logback-examples/pom.xml logback/trunk/logback-site/pom.xml logback/trunk/logback-site/src/site/pages/news.html logback/trunk/pom.xml Log: - preparing release 0.9.17 Modified: logback/trunk/logback-access/pom.xml ============================================================================== --- logback/trunk/logback-access/pom.xml (original) +++ logback/trunk/logback-access/pom.xml Sun Aug 9 20:57:30 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17-SNAPHOT</version> + <version>0.9.17</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-classic/pom.xml ============================================================================== --- logback/trunk/logback-classic/pom.xml (original) +++ logback/trunk/logback-classic/pom.xml Sun Aug 9 20:57:30 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17-SNAPHOT</version> + <version>0.9.17</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-core/pom.xml ============================================================================== --- logback/trunk/logback-core/pom.xml (original) +++ logback/trunk/logback-core/pom.xml Sun Aug 9 20:57:30 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17-SNAPHOT</version> + <version>0.9.17</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-examples/pom.xml ============================================================================== --- logback/trunk/logback-examples/pom.xml (original) +++ logback/trunk/logback-examples/pom.xml Sun Aug 9 20:57:30 2009 @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17-SNAPHOT</version> + <version>0.9.17</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-site/pom.xml ============================================================================== --- logback/trunk/logback-site/pom.xml (original) +++ logback/trunk/logback-site/pom.xml Sun Aug 9 20:57:30 2009 @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17-SNAPHOT</version> + <version>0.9.17</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: logback/trunk/logback-site/src/site/pages/news.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/news.html (original) +++ logback/trunk/logback-site/src/site/pages/news.html Sun Aug 9 20:57:30 2009 @@ -75,6 +75,12 @@ href="http://jira.qos.ch/browse/LBCORE-61">LBCORE-61</a>. </p> + <p>Fixed <a + href="http://jira.qos.ch/browse/LBCLASSIC-145">LBCLASSIC-145</a> + reported by Joern Huxhorn. The <code>LoggingEventVO</code> class + now correctly populates its callerData field if the original + <code>ILoggingEvent</code> already has it.</p> + <hr width="80%" align="center" /> <h3>15th of July 2009 - Release of version 0.9.16</h3> Modified: logback/trunk/pom.xml ============================================================================== --- logback/trunk/pom.xml (original) +++ logback/trunk/pom.xml Sun Aug 9 20:57:30 2009 @@ -5,7 +5,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.17-SNAPHOT</version> + <version>0.9.17</version> <packaging>pom</packaging> <name>Logback-Parent</name>

1 0

svn commit: r2433 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/spi test/java/ch/qos/logback/classic/net
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:44:14 2009 New Revision: 2433 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/net/SocketAppenderTest.java Log: - Add caller data in LoggingEventVO to fix LBCLASSIC-145 Implemented as if(le.hasCallerData()) { ledo.callerData = le.getCallerData(); } as (correctly) suggested by Joern Huxhorn - added test case as appropriate Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggingEventVO.java Sun Aug 9 20:44:14 2009 @@ -58,6 +58,11 @@ ledo.mdcPropertyMap = le.getMDCPropertyMap(); ledo.timeStamp = le.getTimeStamp(); ledo.throwableProxy = ThrowableProxyVO.build(le.getThrowableProxy()); + // add caller data only if it is there already + // fixes http://jira.qos.ch/browse/LBCLASSIC-145 + if(le.hasCallerData()) { + ledo.callerDataArray = le.getCallerData(); + } return ledo; } 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 Sun Aug 9 20:44:14 2009 @@ -11,6 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.util.Map; @@ -39,7 +40,7 @@ LoggerContext serverLC = new LoggerContext(); ListAppender<ILoggingEvent> la = new ListAppender<ILoggingEvent>(); SocketAppender socketAppender = new SocketAppender(); - + private boolean includeCallerData = false; private SimpleSocketServer simpleSocketServer; @Test @@ -68,6 +69,7 @@ assertEquals(1, la.list.size()); ILoggingEvent remoteEvent = la.list.get(0); + assertNull(remoteEvent.getCallerData()); assertEquals("test msg", remoteEvent.getMessage()); assertEquals(Level.DEBUG, remoteEvent.getLevel()); } @@ -95,6 +97,7 @@ LoggerContextVO loggerContextRemoteView = remoteEvent .getLoggerContextVO(); + assertNull(remoteEvent.getCallerData()); assertNotNull(loggerContextRemoteView); assertEquals("test", loggerContextRemoteView.getName()); Map<String, String> props = loggerContextRemoteView.getPropertyMap(); @@ -122,8 +125,31 @@ ILoggingEvent remoteEvent = la.list.get(0); Map<String, String> MDCPropertyMap = remoteEvent.getMDCPropertyMap(); assertEquals("testValue", MDCPropertyMap.get("key")); + assertNull(remoteEvent.getCallerData()); } + // test http://jira.qos.ch/browse/LBCLASSIC-145 + @Test + public void withCallerData() throws InterruptedException { + includeCallerData = true; + fireServer(); + waitForServerToStart(); + configureClient(); + + Logger logger = lc.getLogger(Logger.ROOT_LOGGER_NAME); + logger.debug("test msg"); + + Thread.sleep(SLEEP_AFTER_LOG); + simpleSocketServer.close(); + simpleSocketServer.join(JOIN_OR_WAIT_TIMEOUT); + assertTrue(simpleSocketServer.isClosed()); + ListAppender<ILoggingEvent> la = getListAppender(); + assertEquals(1, la.list.size()); + + ILoggingEvent remoteEvent = la.list.get(0); + assertNotNull(remoteEvent.getCallerData()); + } + @Test public void messageWithMarker() throws InterruptedException { fireServer(); @@ -234,6 +260,7 @@ socketAppender.setName("socket"); socketAppender.setPort(port); socketAppender.setRemoteHost("localhost"); + socketAppender.setIncludeCallerData(includeCallerData); root.addAppender(socketAppender); socketAppender.start(); }

1 0

svn commit: r2432 - logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:25:19 2009 New Revision: 2432 Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Log: - avoid cluttering the console Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/ScaffoldingForRollingTests.java Sun Aug 9 20:25:19 2009 @@ -57,7 +57,6 @@ cal.set(Calendar.MILLISECOND, 333); currentTime = cal.getTimeInMillis(); recomputeRolloverThreshold(currentTime); - System.out.println(randomOutputDir); } public static void existenceCheck(String filename) { @@ -148,7 +147,6 @@ boolean gzExtension) { String fn = randomOutputDir + testId + "-" + SDF.format(date); - System.out.println("adding " + fn); if (gzExtension) { fn += ".gz"; } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java Sun Aug 9 20:25:19 2009 @@ -85,7 +85,6 @@ @Test public void montlyRolloverOverManyPeriods() throws Exception { - System.out.println(randomOutputDir); // small maxHistory, many periods slashCount = computeSlashCount(MONTHLY_CROLOLOG_DATE_PATTERN); doRollover(randomOutputDir + "/%d{" + MONTHLY_CROLOLOG_DATE_PATTERN @@ -104,7 +103,6 @@ @Test public void dailyCronologRollover() throws Exception { - System.out.println(randomOutputDir); slashCount = computeSlashCount(DAILY_CROLOLOG_DATE_PATTERN); doRollover(randomOutputDir + "/%d{" + DAILY_CROLOLOG_DATE_PATTERN + "}/clean.txt.zip", MILLIS_IN_DAY, 8, 8 * 3); @@ -278,8 +276,6 @@ File dir = new File(randomOutputDir); List<File> fileList = new ArrayList<File>(); findFilesInFolderRecursivelyByPatterMatch(dir, fileList, regex); - System.out.println("regex=" + regex); - System.out.println("fileList=" + fileList); Set<String> set = groupByClass(fileList, regex); assertEquals(expectedClassCount, set.size()); }

1 0

svn commit: r2431 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling
by noreply.ceki＠qos.ch 09 Aug '09

09 Aug '09

Author: ceki Date: Sun Aug 9 20:18:10 2009 New Revision: 2431 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java Log: - avoid cluttering the console Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java Sun Aug 9 20:18:10 2009 @@ -83,11 +83,9 @@ } if (activeFile.length() >= maxFileSize.getSize()) { - System.out.println("Size based trigger, currentPeriodsCounter="+currentPeriodsCounter); elapsedPeriodsFileName = tbrp.fileNamePatternWCS .convertMultipleArguments(dateInCurrentPeriod, currentPeriodsCounter); currentPeriodsCounter++; - System.out.println("Size based trigger, currentPeriodsCounter="+currentPeriodsCounter); return true; }

1 0