- logback-dev - mailman3.qos.ch

svn commit: r2328 - in logback/trunk/logback-core/src: main/java/ch/qos/logback/core main/java/ch/qos/logback/core/rolling main/java/ch/qos/logback/core/rolling/helper test/java/ch/qos/logback/core/contention test/java/ch/qos/logback/core/rolling test/java/ch/qos/logback/core/status
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 15:02:33 2009 New Revision: 2328 Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java 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/helper/PeriodicityType.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Log: Working on thread safety of RollingAppender, related to LBCLASSIC-142 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Wed Jul 8 15:02:33 2009 @@ -22,8 +22,8 @@ /** * FileAppender appends log events to a file. * - * For more informatio about this appender, please refer to the online manual at - * http://logback.qos.ch/manual/appenders.html#FileAppender + * For more information about this appender, please refer to the online manual + * at http://logback.qos.ch/manual/appenders.html#FileAppender * * @author Ceki Gülcü */ @@ -66,13 +66,13 @@ * the file to append to. */ public void setFile(String file) { - if(file == null) { + if (file == null) { fileName = file; } else { // Trim spaces from both ends. The users probably does not want // trailing spaces in file names. String val = file.trim(); - fileName = val; + fileName = val; } } @@ -90,7 +90,6 @@ return append; } - /** * This method is used by derived classes to obtain the raw file property. * Regular users should not be calling this method. 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 Wed Jul 8 15:02:33 2009 @@ -52,13 +52,13 @@ addError("For more information, please visit http://logback.qos.ch/codes.html#rfa_no_rp"); return; } - - if(isPrudent()) { - if(rawFileProperty() != null) { + + if (isPrudent()) { + if (rawFileProperty() != null) { addWarn("Setting \"File\" property to null on account of prudent mode"); - setFile(null); + setFile(null); } - if(rollingPolicy.getCompressionMode() != CompressionMode.NONE) { + if (rollingPolicy.getCompressionMode() != CompressionMode.NONE) { addError("Compression is not supported in prudent mode. Aborting"); return; } @@ -73,14 +73,13 @@ public void setFile(String file) { // http://jira.qos.ch/browse/LBCORE-94 // allow setting the file name to null if mandated by prudent mode - if(file != null && ((triggeringPolicy != null) || (rollingPolicy != null))) { + if (file != null && ((triggeringPolicy != null) || (rollingPolicy != null))) { addError("File property must be set before any triggeringPolicy or rollingPolicy properties"); addError("Visit http://logback.qos.ch/codes.html#rfa_file_after for more information"); } super.setFile(file); } - @Override public String getFile() { return rollingPolicy.getActiveFileName(); @@ -131,8 +130,10 @@ protected void subAppend(E event) { // The roll-over check must precede actual writing. This is the // only correct behavior for time driven triggers. - if (triggeringPolicy.isTriggeringEvent(activeFile, event)) { - rollover(); + synchronized (triggeringPolicy) { + if (triggeringPolicy.isTriggeringEvent(activeFile, event)) { + rollover(); + } } super.subAppend(event); Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/PeriodicityType.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/PeriodicityType.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/PeriodicityType.java Wed Jul 8 15:02:33 2009 @@ -1,16 +1,24 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package ch.qos.logback.core.rolling.helper; public enum PeriodicityType { - ERRONEOUS, TOP_OF_SECOND, TOP_OF_MINUTE, TOP_OF_HOUR, HALF_DAY, TOP_OF_DAY, TOP_OF_WEEK, TOP_OF_MONTH; + ERRONEOUS, TOP_OF_MILLISECOND, TOP_OF_SECOND, TOP_OF_MINUTE, TOP_OF_HOUR, HALF_DAY, TOP_OF_DAY, TOP_OF_WEEK, TOP_OF_MONTH; - // The followed list is assued to be in + // The followed list consists of valid periodicy types in increasing period + // lengths static PeriodicityType[] VALID_ORDERED_LIST = new PeriodicityType[] { - PeriodicityType.TOP_OF_SECOND, - PeriodicityType.TOP_OF_MINUTE, - PeriodicityType.TOP_OF_HOUR, - PeriodicityType.TOP_OF_DAY, - PeriodicityType.TOP_OF_WEEK, + TOP_OF_MILLISECOND, PeriodicityType.TOP_OF_SECOND, + PeriodicityType.TOP_OF_MINUTE, PeriodicityType.TOP_OF_HOUR, + PeriodicityType.TOP_OF_DAY, PeriodicityType.TOP_OF_WEEK, PeriodicityType.TOP_OF_MONTH }; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/RollingCalendar.java Wed Jul 8 15:02:33 2009 @@ -75,7 +75,8 @@ if (datePattern != null) { for (PeriodicityType i : PeriodicityType.VALID_ORDERED_LIST) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat(datePattern); - simpleDateFormat.setTimeZone(GMT_TIMEZONE); // all date formatting done in GMT + simpleDateFormat.setTimeZone(GMT_TIMEZONE); // all date formatting done + // in GMT String r0 = simpleDateFormat.format(epoch); rollingCalendar.setType(i); @@ -90,44 +91,41 @@ } } // we failed - return PeriodicityType.ERRONEOUS; + return PeriodicityType.ERRONEOUS; } public void printPeriodicity(ContextAwareBase cab) { switch (type) { + case TOP_OF_MILLISECOND: + cab.addInfo("Roll-over every millisecond."); + break; + case TOP_OF_SECOND: cab.addInfo("Roll-over every second."); - break; case TOP_OF_MINUTE: cab.addInfo("Roll-over every minute."); - break; case TOP_OF_HOUR: cab.addInfo("Roll-over at the top of every hour."); - break; case HALF_DAY: cab.addInfo("Roll-over at midday and midnight."); - break; case TOP_OF_DAY: cab.addInfo("Roll-over at midnight."); - break; case TOP_OF_WEEK: cab.addInfo("Rollover at the start of week."); - break; case TOP_OF_MONTH: cab.addInfo("Rollover at start of every month."); - break; default: @@ -139,17 +137,19 @@ this.setTime(now); switch (type) { + case TOP_OF_MILLISECOND: + this.add(Calendar.MILLISECOND, periods); + break; + case TOP_OF_SECOND: this.set(Calendar.MILLISECOND, 0); this.add(Calendar.SECOND, periods); - break; case TOP_OF_MINUTE: this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.MINUTE, periods); - break; case TOP_OF_HOUR: @@ -157,7 +157,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.HOUR_OF_DAY, periods); - break; case TOP_OF_DAY: @@ -166,7 +165,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.DATE, periods); - break; case TOP_OF_WEEK: @@ -176,7 +174,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.WEEK_OF_YEAR, periods); - break; case TOP_OF_MONTH: @@ -186,7 +183,6 @@ this.set(Calendar.SECOND, 0); this.set(Calendar.MILLISECOND, 0); this.add(Calendar.MONTH, periods); - break; default: @@ -195,7 +191,7 @@ return getTime(); } - + public Date getNextTriggeringDate(Date now) { return getRelativeDate(now, 1); } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/MultiThreadedHarness.java Wed Jul 8 15:02:33 2009 @@ -0,0 +1,65 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ +package ch.qos.logback.core.contention; + + +/** + * Useful scaffolding/harness to start and stop multiple threads. + * + * @author Joern Huxhorn + * @author Ralph Goers + * @author Ceki Gulcu + */ +public class MultiThreadedHarness { + + RunnableWithCounterAndDone[] runnableArray; + Thread[] threadArray; + final long overallDurationInMillis; + + public MultiThreadedHarness(long overallDurationInMillis) { + this.overallDurationInMillis = overallDurationInMillis; + } + + public void printEnvironmentInfo(String msg) { + System.out.println("=== " + msg + " ==="); + System.out.println("java.runtime.version = " + + System.getProperty("java.runtime.version")); + System.out.println("java.vendor = " + + System.getProperty("java.vendor")); + System.out.println("java.version = " + + System.getProperty("java.version")); + System.out.println("os.name = " + + System.getProperty("os.name")); + System.out.println("os.version = " + + System.getProperty("os.version")); + } + + public void execute(RunnableWithCounterAndDone[] runnableArray) + throws InterruptedException { + this.runnableArray = runnableArray; + Thread[] threadArray = new Thread[runnableArray.length]; + + for (int i = 0; i < runnableArray.length; i++) { + threadArray[i] = new Thread(runnableArray[i]); + } + for (Thread t : threadArray) { + t.start(); + } + // let the threads run for a while + Thread.sleep(overallDurationInMillis); + + for (RunnableWithCounterAndDone r : runnableArray) { + r.setDone(true); + } + for (Thread t : threadArray) { + t.join(); + } + } +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/contention/ThreadedThroughputCalculator.java Wed Jul 8 15:02:33 2009 @@ -1,8 +1,16 @@ +/** + * Logback: the generic, reliable, fast and flexible logging framework. + * + * Copyright (C) 2000-2009, QOS.ch + * + * This library is free software, you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation. + */ package ch.qos.logback.core.contention; /** - * * Useful scaffolding to measure the throughput of certain operations when * invoked by multiple threads. * @@ -10,51 +18,13 @@ * @author Ralph Goers * @author Ceki Gulcu */ -public class ThreadedThroughputCalculator { +public class ThreadedThroughputCalculator extends MultiThreadedHarness { - RunnableWithCounterAndDone[] runnableArray; - Thread[] threadArray; - final long overallDurationInMillis; public ThreadedThroughputCalculator(long overallDurationInMillis) { - this.overallDurationInMillis = overallDurationInMillis; - } - - public void printEnvironmentInfo(String msg) { - System.out.println("=== " + msg + " ==="); - System.out.println("java.runtime.version = " - + System.getProperty("java.runtime.version")); - System.out.println("java.vendor = " - + System.getProperty("java.vendor")); - System.out.println("java.version = " - + System.getProperty("java.version")); - System.out.println("os.name = " - + System.getProperty("os.name")); - System.out.println("os.version = " - + System.getProperty("os.version")); + super(overallDurationInMillis); } - public void execute(RunnableWithCounterAndDone[] runnableArray) - throws InterruptedException { - this.runnableArray = runnableArray; - Thread[] threadArray = new Thread[runnableArray.length]; - - for (int i = 0; i < runnableArray.length; i++) { - threadArray[i] = new Thread(runnableArray[i]); - } - for (Thread t : threadArray) { - t.start(); - } - // let the threads run for a while - Thread.sleep(overallDurationInMillis); - - for (RunnableWithCounterAndDone r : runnableArray) { - r.setDone(true); - } - for (Thread t : threadArray) { - t.join(); - } - } public void printThroughput(String msg) throws InterruptedException { printThroughput(msg, false); } Added: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java ============================================================================== --- (empty file) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java Wed Jul 8 15:02:33 2009 @@ -0,0 +1,108 @@ +package ch.qos.logback.core.rolling; + +import static org.junit.Assert.fail; + +import java.io.File; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.Layout; +import ch.qos.logback.core.contention.MultiThreadedHarness; +import ch.qos.logback.core.contention.RunnableWithCounterAndDone; +import ch.qos.logback.core.layout.EchoLayout; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.CoreTestConstants; +import ch.qos.logback.core.util.StatusPrinter; + +public class MultiThreadedRollingTest { + + final static int NUM_THREADS = 5; + final static int TOTAL_DURATION = 2000; + + Layout<Object> layout; + Context context = new ContextBase(); + + int diff = RandomUtil.getPositiveInt(); + String outputDirStr = CoreTestConstants.OUTPUT_DIR_PREFIX + "multi-" + diff + + "/"; + + RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); + + @Before + public void setUp() throws Exception { + layout = new EchoLayout<Object>(); + File outputDir = new File(outputDirStr); + outputDir.mkdirs(); + + rfa.setName("rolling"); + rfa.setLayout(layout); + rfa.setContext(context); + rfa.setFile(outputDirStr + "output.log"); + String datePattern = "yyyy-MM-dd'T'HH_mm_ss_SSS"; + + TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); + tbrp.setFileNamePattern(outputDirStr + "test-%d{" + datePattern + "}"); + tbrp.setContext(context); + tbrp.setParent(rfa); + tbrp.start(); + + rfa.setRollingPolicy(tbrp); + rfa.start(); + } + + @After + public void tearDown() throws Exception { + rfa.stop(); + } + + RunnableWithCounterAndDone[] buildRunnableArray() { + RunnableWithCounterAndDone[] runnableArray = new RunnableWithCounterAndDone[NUM_THREADS]; + for (int i = 0; i < NUM_THREADS; i++) { + runnableArray[i] = new RFARunnable(i, rfa); + } + return runnableArray; + } + + @Test + public void executeHarness() throws InterruptedException { + MultiThreadedHarness multiThreadedHarness = new MultiThreadedHarness(TOTAL_DURATION); + RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(); + multiThreadedHarness.execute(runnableArray); + StatusPrinter.print(context); + + StatusChecker checker = new StatusChecker(context.getStatusManager()); + if(!checker.isErrorFree()) { + fail("errors reported"); + StatusPrinter.print(context); + } + + } + + long diff(long start) { + return System.currentTimeMillis() - start; + } + + static class RFARunnable extends RunnableWithCounterAndDone { + RollingFileAppender<Object> rfa; + int id; + RFARunnable(int id, RollingFileAppender<Object> rfa) { + this.id = id; + this.rfa = rfa; + } + + public void run() { + while (!isDone()) { + counter++; + rfa.doAppend(id + " " + counter); + } + System.out.println("id="+id + ", counter="+counter + " on exit"); + } + + } + +} Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/PackageTest.java Wed Jul 8 15:02:33 2009 @@ -5,7 +5,7 @@ @RunWith(Suite.class) @Suite.SuiteClasses( { RenamingTest.class, SizeBasedRollingTest.class, - TimeBasedRollingTest.class, + TimeBasedRollingTest.class, TimeBasedRollingWithCleanTest.class, ch.qos.logback.core.rolling.helper.PackageTest.class }) public class PackageTest { } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Wed Jul 8 15:02:33 2009 @@ -24,6 +24,11 @@ this.sm = sm; } + public boolean isErrorFree() { + int level = sm.getLevel(); + return level < Status.ERROR; + } + public boolean containsMatch(int level, String regex) { Pattern p = Pattern.compile(regex);

1 0

svn commit: r2327 - logback/trunk/logback-core/src/main/java/ch/qos/logback/core
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 13:53:10 2009 New Revision: 2327 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Log: - typo fix Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Wed Jul 8 13:53:10 2009 @@ -93,7 +93,7 @@ /** * This method is used by derived classes to obtain the raw file property. - * Regular users should not be using calling method. + * Regular users should not be calling this method. * * @return the value of the file property */

1 0

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

08 Jul '09

Author: ceki Date: Wed Jul 8 13:52:45 2009 New Revision: 2326 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingFileAppender.java Log: - rename a field 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 Wed Jul 8 13:52:45 2009 @@ -27,7 +27,7 @@ * @author Ceki Gülcü */ public class RollingFileAppender<E> extends FileAppender<E> { - File activeFileCache; + File activeFile; TriggeringPolicy<E> triggeringPolicy; RollingPolicy rollingPolicy; @@ -64,7 +64,7 @@ } } - activeFileCache = new File(getFile()); + activeFile = new File(getFile()); addInfo("Active log file name: " + getFile()); super.start(); } @@ -108,11 +108,6 @@ // does not work for open files. this.closeWriter(); - // By default, the newly created file will be created in truncate mode. - // (See the setFile() call a few lines below.) - // FIXME don't change the append mode - // this.append = false; - try { rollingPolicy.rollover(); } catch (RolloverFailure rf) { @@ -136,7 +131,7 @@ protected void subAppend(E event) { // The roll-over check must precede actual writing. This is the // only correct behavior for time driven triggers. - if (triggeringPolicy.isTriggeringEvent(activeFileCache, event)) { + if (triggeringPolicy.isTriggeringEvent(activeFile, event)) { rollover(); }

1 0

svn commit: r2325 - logback/trunk/logback-site/src/site/pages
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 12:44:39 2009 New Revision: 2325 Modified: logback/trunk/logback-site/src/site/pages/news.html Log: blurb about LBCLASSIC-134 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 Wed Jul 8 12:44:39 2009 @@ -86,6 +86,13 @@ now generate an error status message. + Fixed <a + href="http://jira.qos.ch/browse/LBCLASSIC-134">LBCLASSIC-134</a> + reported by Darryl Smith. <code>DuplicateMessageFilter</code> will + now behave correctly when invoked via + <code>Logger.isXXXEnabled</code> methods. + + <hr width="80%" align="center" /> <h3>12th of February 2009 - Release of version 0.9.15</h3>

1 0

[JIRA] Created: (LBCLASSIC-134) DuplicateMessageFilter should bypass checking msgCache for null formats
by Darryl Smith (JIRA) 08 Jul '09

08 Jul '09

DuplicateMessageFilter should bypass checking msgCache for null formats ----------------------------------------------------------------------- Key: LBCLASSIC-134 URL: http://jira.qos.ch/browse/LBCLASSIC-134 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.15 Reporter: Darryl Smith Assignee: Logback dev list Attachments: LBCLASSIC-134.patch Calls to isXXXEnabled translate to a call to Logger.callTurboFilters which invokes DuplicateMessageFilter with a null format DuplicateMessageFilter usage of LRUMessageCache will group together all null formats under msgCount. e.g. msgCache.getMessageCount(null) = msgCount 1 msgCache.getMessageCount(null) = msgCount 2 msgCache.getMessageCount(null) = msgCount 3 -- 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 2

svn commit: r2324 - in logback/trunk/logback-classic/src: main/java/ch/qos/logback/classic/turbo test/java/ch/qos/logback/classic/turbo
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 12:14:59 2009 New Revision: 2324 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java Log: Fix LBCLASSIC-134 Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/DuplicateMessageFilter.java Wed Jul 8 12:14:59 2009 @@ -55,7 +55,7 @@ @Override public FilterReply decide(Marker marker, Logger logger, Level level, String format, Object[] params, Throwable t) { - int count = msgCache.getMessageCount(format); + int count = msgCache.getMessageCountAndThenIncrement(format); if (count <= allowedRepetitions) { return FilterReply.NEUTRAL; } else { Modified: logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java ============================================================================== --- logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java (original) +++ logback/trunk/logback-classic/src/main/java/ch/qos/logback/classic/turbo/LRUMessageCache.java Wed Jul 8 12:14:59 2009 @@ -14,6 +14,8 @@ class LRUMessageCache extends LinkedHashMap<String, Integer> { + // LinkedHashMap permits null elements to be inserted + private static final long serialVersionUID = 1L; final int cacheSize; @@ -26,7 +28,12 @@ this.cacheSize = cacheSize; } - int getMessageCount(String msg) { + int getMessageCountAndThenIncrement(String msg) { + // don't insert null elements + if(msg == null) { + return 0; + } + Integer i = super.get(msg); if(i == null) { i = 0; Modified: logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java ============================================================================== --- logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java (original) +++ logback/trunk/logback-classic/src/test/java/ch/qos/logback/classic/turbo/DuplicateMessageFilterTest.java Wed Jul 8 12:14:59 2009 @@ -15,49 +15,71 @@ import ch.qos.logback.core.spi.FilterReply; - public class DuplicateMessageFilterTest { - @Test public void smoke() { DuplicateMessageFilter dmf = new DuplicateMessageFilter(); dmf.setAllowedRepetitions(0); dmf.start(); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "x", null, null)); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "y", null, null)); - assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "x", null, null)); - assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "y", null, null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "x", null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "y", null, + null)); + assertEquals(FilterReply.DENY, dmf + .decide(null, null, null, "x", null, null)); + assertEquals(FilterReply.DENY, dmf + .decide(null, null, null, "y", null, null)); } - + @Test public void memoryLoss() { DuplicateMessageFilter dmf = new DuplicateMessageFilter(); dmf.setAllowedRepetitions(1); dmf.setCacheSize(1); dmf.start(); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, null)); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "b", null, null)); - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "b", null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a", null, + null)); } - @Test public void many() { DuplicateMessageFilter dmf = new DuplicateMessageFilter(); dmf.setAllowedRepetitions(0); int cacheSize = 10; - int margin = 2; + int margin = 2; dmf.setCacheSize(cacheSize); dmf.start(); - for(int i = 0; i < cacheSize+margin; i++) { - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a"+i, null, null)); + for (int i = 0; i < cacheSize + margin; i++) { + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a" + i, + null, null)); } - for(int i = cacheSize-1; i >= margin; i--) { - assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "a"+i, null, null)); + for (int i = cacheSize - 1; i >= margin; i--) { + assertEquals(FilterReply.DENY, dmf.decide(null, null, null, "a" + i, + null, null)); } - for(int i = margin-1; i >= 0; i--) { - assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a"+i, null, null)); + for (int i = margin - 1; i >= 0; i--) { + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, "a" + i, + null, null)); } } + + @Test + // isXXXEnabled invokes decide with a null format + // http://jira.qos.ch/browse/LBCLASSIC-134 + public void nullFormat() { + DuplicateMessageFilter dmf = new DuplicateMessageFilter(); + dmf.setAllowedRepetitions(0); + dmf.setCacheSize(10); + dmf.start(); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, null, null, + null)); + assertEquals(FilterReply.NEUTRAL, dmf.decide(null, null, null, null, null, + null)); + } + }

1 0

[JIRA] Created: (LBCORE-105) config files found in jar file lock the jar file
by Ceki Gulcu (JIRA) 08 Jul '09

08 Jul '09

config files found in jar file lock the jar file ------------------------------------------------ Key: LBCORE-105 URL: http://jira.qos.ch/browse/LBCORE-105 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.15 Reporter: Ceki Gulcu Assignee: Ceki Gulcu When a config file is obtained from within a jar file, the jar file is locked. This causes trouble when the application needs to be reloaded. See also bug #47465 in log4j. The solution is to set the setDefaultUseCaches to false when opening the url connection. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 2

svn commit: r2323 - logback/trunk/logback-site/src/site/pages
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 10:27:22 2009 New Revision: 2323 Modified: logback/trunk/logback-site/src/site/pages/news.html Log: minor rewording 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 Wed Jul 8 10:27:22 2009 @@ -82,7 +82,7 @@ Fixed <a href="http://jira.qos.ch/browse/LBCORE-94">LBCORE-94</a>. While configuring a RollingFileAppender, if the File property is - declared after any rolling triggering policies, then logback will + declared after any rolling or triggering policies, then logback will now generate an error status message.

1 0

[JIRA] Created: (LBCORE-94) Rollover at launch time
by Ceki Gulcu (JIRA) 08 Jul '09

08 Jul '09

Rollover at launch time ----------------------- Key: LBCORE-94 URL: http://jira.qos.ch/browse/LBCORE-94 Project: logback-core Issue Type: Bug Components: Rolling Affects Versions: 0.9.15 Reporter: Ceki Gulcu Assignee: Ceki Gulcu Rollover does not occur for old files when short lived application is restarted. This issue is related to LBCORE-26.However, the solution implemented in LBCORE-26 works if the RollingFileAppender has the File property set. This is not always the case. For instance <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <FileNamePattern>test.%d.log.zip</FileNamePattern> </rollingPolicy> <layout/> </appender> <root level="info"> <appender-ref ref="FILE"/> </root> Problem originally reported by Ch Pasha. See also http://www.qos.ch/pipermail/logback-user/2009-March/001030.html -- 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

svn commit: r2322 - in logback/trunk: logback-core/src/main/java/ch/qos/logback/core logback-core/src/main/java/ch/qos/logback/core/rolling logback-core/src/test/java/ch/qos/logback/core/rolling logback-core/src/test/java/ch/qos/logback/core/status logback-site/src/site/pages logback-site/src/site/pages/manual
by noreply.ceki＠qos.ch 08 Jul '09

08 Jul '09

Author: ceki Date: Wed Jul 8 10:24:27 2009 New Revision: 2322 Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java 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/TimeBasedRollingPolicy.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java logback/trunk/logback-site/src/site/pages/codes.html logback/trunk/logback-site/src/site/pages/manual/appenders.html logback/trunk/logback-site/src/site/pages/news.html Log: Fix LBCORE-94 Within A RollingFileAppender, if the File property is declared after any rolling or triggering policies, then generate an error status message. Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java Wed Jul 8 10:24:27 2009 @@ -81,4 +81,6 @@ static public final char DOT = '.'; static public final char TAB = '\t'; + + static public final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/FileAppender.java Wed Jul 8 10:24:27 2009 @@ -73,9 +73,7 @@ // trailing spaces in file names. String val = file.trim(); fileName = val; - } - } /** Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java Wed Jul 8 10:24:27 2009 @@ -11,6 +11,7 @@ import java.io.File; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.rolling.helper.CompressionMode; import ch.qos.logback.core.rolling.helper.Compressor; import ch.qos.logback.core.rolling.helper.FileNamePattern; @@ -28,7 +29,6 @@ */ public class FixedWindowRollingPolicy extends RollingPolicyBase { static final String FNP_NOT_SET = "The \"FileNamePattern\" property must be set before using FixedWindowRollingPolicy. "; - static final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; static final String PRUDENT_MODE_UNSUPPORTED = "See also http://logback.qos.ch/codes.html#tbr_fnp_prudent_unsupported"; static final String SEE_PARENT_FN_NOT_SET = "Please refer to http://logback.qos.ch/codes.html#fwrp_parentFileName_not_set"; int maxIndex; @@ -54,8 +54,8 @@ determineCompressionMode(); } else { addError(FNP_NOT_SET); - addError(SEE_FNP_NOT_SET); - throw new IllegalStateException(FNP_NOT_SET + SEE_FNP_NOT_SET); + addError(CoreConstants.SEE_FNP_NOT_SET); + throw new IllegalStateException(FNP_NOT_SET + CoreConstants.SEE_FNP_NOT_SET); } if(isParentPrudent()) { 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 Wed Jul 8 10:24:27 2009 @@ -70,6 +70,18 @@ } @Override + public void setFile(String file) { + // http://jira.qos.ch/browse/LBCORE-94 + // allow setting the file name to null if mandated by prudent mode + if(file != null && ((triggeringPolicy != null) || (rollingPolicy != null))) { + addError("File property must be set before any triggeringPolicy or rollingPolicy properties"); + addError("Visit http://logback.qos.ch/codes.html#rfa_file_after for more information"); + } + super.setFile(file); + } + + + @Override public String getFile() { return rollingPolicy.getActiveFileName(); } Modified: logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java ============================================================================== --- logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java (original) +++ logback/trunk/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.java Wed Jul 8 10:24:27 2009 @@ -13,6 +13,7 @@ import java.util.Date; import java.util.concurrent.Future; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.rolling.helper.AsynchronousCompressor; import ch.qos.logback.core.rolling.helper.CompressionMode; import ch.qos.logback.core.rolling.helper.Compressor; @@ -35,7 +36,6 @@ public class TimeBasedRollingPolicy<E> extends RollingPolicyBase implements TriggeringPolicy<E> { static final String FNP_NOT_SET = "The FileNamePattern option must be set before using TimeBasedRollingPolicy. "; - static final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; static final int NO_DELETE_HISTORY = 0; RollingCalendar rc; @@ -77,8 +77,8 @@ determineCompressionMode(); } else { addWarn(FNP_NOT_SET); - addWarn(SEE_FNP_NOT_SET); - throw new IllegalStateException(FNP_NOT_SET + SEE_FNP_NOT_SET); + addWarn(CoreConstants.SEE_FNP_NOT_SET); + throw new IllegalStateException(FNP_NOT_SET + CoreConstants.SEE_FNP_NOT_SET); } DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java Wed Jul 8 10:24:27 2009 @@ -9,11 +9,11 @@ */ package ch.qos.logback.core.rolling; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.junit.After; import org.junit.Before; @@ -25,7 +25,9 @@ import ch.qos.logback.core.appender.AbstractAppenderTest; import ch.qos.logback.core.layout.DummyLayout; import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.util.StatusPrinter; public class RollingFileAppenderTest extends AbstractAppenderTest<Object> { @@ -36,10 +38,11 @@ @Before public void setUp() throws Exception { + // noStartTest fails if the context is set in setUp + // rfa.setContext(context); + rfa.setLayout(new DummyLayout<Object>()); rfa.setName("test"); - rfa.setRollingPolicy(tbrp); - tbrp.setContext(context); tbrp.setParent(rfa); } @@ -48,7 +51,6 @@ public void tearDown() throws Exception { } - @Override protected Appender<Object> getAppender() { return rfa; @@ -57,20 +59,16 @@ @Override protected Appender<Object> getConfiguredAppender() { rfa.setContext(context); - tbrp.setFileNamePattern("toto-%d.log"); tbrp.start(); - + rfa.setRollingPolicy(tbrp); + rfa.start(); return rfa; } - @Test public void testPrudentModeLogicalImplications() { - tbrp.setFileNamePattern("toto-%d.log"); - tbrp.start(); - rfa.setContext(context); // prudent mode will force "file" property to be null rfa.setFile("some non null value"); @@ -78,6 +76,11 @@ rfa.setImmediateFlush(false); rfa.setBufferedIO(true); rfa.setPrudent(true); + + tbrp.setFileNamePattern("toto-%d.log"); + tbrp.start(); + rfa.setRollingPolicy(tbrp); + rfa.start(); assertTrue(rfa.getImmediateFlush()); @@ -87,23 +90,43 @@ assertTrue(rfa.isStarted()); } - @Test public void testPrudentModeLogicalImplicationsOnCompression() { - tbrp.setFileNamePattern("toto-%d.log.zip"); - tbrp.start(); - rfa.setContext(context); rfa.setAppend(false); rfa.setImmediateFlush(false); rfa.setBufferedIO(true); rfa.setPrudent(true); + + tbrp.setFileNamePattern("toto-%d.log.zip"); + tbrp.start(); + rfa.setRollingPolicy(tbrp); + rfa.start(); StatusManager sm = context.getStatusManager(); assertFalse(rfa.isStarted()); assertEquals(Status.ERROR, sm.getLevel()); } - - + + @Test + public void testFilePropertyAfterRollingPolicy() { + rfa.setContext(context); + rfa.setRollingPolicy(tbrp); + rfa.setFile("x"); + StatusPrinter.print(context); + StatusChecker statusChecker = new StatusChecker(context.getStatusManager()); + statusChecker.containsMatch(Status.ERROR, + "File property must be set before any triggeringPolicy "); + } + + @Test + public void testFilePropertyAfterTriggeringPolicy() { + rfa.setContext(context); + rfa.setTriggeringPolicy(new SizeBasedTriggeringPolicy<Object>()); + rfa.setFile("x"); + StatusChecker statusChecker = new StatusChecker(context.getStatusManager()); + statusChecker.containsMatch(Status.ERROR, + "File property must be set before any triggeringPolicy "); + } } Modified: logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java ============================================================================== --- logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java (original) +++ logback/trunk/logback-core/src/test/java/ch/qos/logback/core/status/StatusChecker.java Wed Jul 8 10:24:27 2009 @@ -24,21 +24,31 @@ this.sm = sm; } - public boolean containsMatch(String regex) { - + public boolean containsMatch(int level, String regex) { Pattern p = Pattern.compile(regex); - Iterator stati = sm.getCopyOfStatusList().iterator(); - while (stati.hasNext()) { - Status status = (Status) stati.next(); + for(Status status: sm.getCopyOfStatusList()) { + if(level != status.getLevel()) { + continue; + } String msg = status.getMessage(); Matcher matcher = p.matcher(msg); if (matcher.lookingAt()) { return true; - } else { - System.out.println("no match:" + msg); - System.out.println("regex :" + regex); - } + } + } + return false; + + } + + public boolean containsMatch(String regex) { + Pattern p = Pattern.compile(regex); + for(Status status: sm.getCopyOfStatusList()) { + String msg = status.getMessage(); + Matcher matcher = p.matcher(msg); + if (matcher.lookingAt()) { + return true; + } } return false; } Modified: logback/trunk/logback-site/src/site/pages/codes.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/codes.html (original) +++ logback/trunk/logback-site/src/site/pages/codes.html Wed Jul 8 10:24:27 2009 @@ -40,62 +40,6 @@ <hr/> - - - <a name="tbr_fnp_not_set" href="#tbr_fnp_not_set"> - The FileNamePattern option must be set before using - <code>TimeBasedRollingPolicy</code> or - <code>FixedWindowRollingPolicy</code> - </a> - - - - The FileNamePattern option for both - <code>TimeBasedRollingPolicy</code> and - <code>FixedWindowRollingPolicy</code> is mandatory. - - - See the <a - href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/FixedWindowRollin…"> - FixedWindowRollingPolicy javadoc </a> for more information. - - - <hr /> - - - <a name="fwrp_parentFileName_not_set" href="#fwrp_parentFileName_not_set"> - The File option must be set before - <code>FixedWindowRollingPolicy</code> - </a> - - - The File option is mandatory with - <code>FixedWindowRollingPolicy</code>. Moreover, the File option must be set before the - <code>FixedWindowRollingPolicy</code> element. - - - Refer to the logback manual on - <a href="manual/appenders.html#FixedWindowRollingPolicy"> - FixedWindowRollingPolicy </a> for more information. - - - <hr /> - - <a name="tbr_fnp_prudent_unsupported" - href="#tbr_fnp_prudent_unsupported">Prudent mode is not supported - with <code>FixedWindowRollingPolicy</code>.</a> - - - Given that <code>FixedWindowRollingPolicy</code> performs - multiple file rename operations suring roll over, and that these - operations cannot be guaranteed to be safe in a multi-JVM context, - prudent mode is not allowed in conjuction with a - <code>FixedWindowRollingPolicy</code>. - - - <hr/> - <a name="socket_no_host" href="#socket_no_host">No remote host or address is set for <code>SocketAppender</code> @@ -191,9 +135,11 @@ <hr /> - <a name="rfa_no_tp" href="#rfa_no_tp">No <code>TriggeringPolicy</code> was set for - the <code>RollingFileAppender</code>. - </a> + + <a name="rfa_no_tp" href="#rfa_no_tp">No + <code>TriggeringPolicy</code> was set for the + <code>RollingFileAppender</code>. + </a> The <code>RollingFileAppender</code> must be set up with a @@ -208,12 +154,12 @@ <ul> <li> <a - href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/SizeBasedTriggeri…"><code>SizeBasedTriggeringPolicy</code> + href="manual/appenders.html#SizeBasedTriggeringPolicy"><code>SizeBasedTriggeringPolicy</code> </a> </li> <li> <a - href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/TimeBasedRollingP…"><code>TimeBasedRollingPolicy</code> + href="manual/appenders.html#TimeBasedRollingPolicy"><code>TimeBasedRollingPolicy</code> </a> </li> </ul> @@ -243,12 +189,12 @@ <ul> <li> - <a href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/FixedWindowRollin…"> + <a href="apidocs/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.html"> <code>FixedWindowRollingPolicy</code> </a> </li> <li> - <a href="http://logback.qos.ch/apidocs/ch/qos/logback/core/rolling/TimeBasedRollingP…"> + <a href="apidocs/ch/qos/logback/core/rolling/TimeBasedRollingPolicy.html"> <code>TimeBasedRollingPolicy</code> </a> </li> @@ -262,9 +208,82 @@ <hr/> + + <a name="tbr_fnp_not_set" href="#tbr_fnp_not_set"> + The FileNamePattern property is mandatory for both + <code>TimeBasedRollingPolicy</code> and + <code>FixedWindowRollingPolicy</code>. + </a> + + + + The FileNamePattern property for both + <code>TimeBasedRollingPolicy</code> and + <code>FixedWindowRollingPolicy</code> is mandatory. + + + Please refer to the documentation of <a + href="manual/appenders.html#TimeBasedRollingPolicy">TimeBasedRollingPolicy</a> + and <a + href="manual/appenders.html#FixedWindowRollingPolicy">FixedWindowRollingPolicy</a> for + examples. + + + + <hr/> + + + <a name="rfa_file_after" href="#rfa_file_after"> + The File property must be set before + any rolling policy or triggering policy. + </a> + + + The File property, if present, must + be placed before any rolling policy or triggering policy. Thus, in a + configuration file, the File property, + if present, must be declared declared before any rolling policy or + triggering policy declarations. + + + <hr/> + + + <a name="fwrp_parentFileName_not_set" href="#fwrp_parentFileName_not_set"> + The File property must be set before + <code>FixedWindowRollingPolicy</code> + </a> + + + The File property is mandatory with + <code>FixedWindowRollingPolicy</code>. Moreover, the File option must be set before the + <code>FixedWindowRollingPolicy</code> element. + + + Refer to the logback manual on + <a href="manual/appenders.html#FixedWindowRollingPolicy"> + FixedWindowRollingPolicy </a> for more information. + + + <hr /> + + <a name="tbr_fnp_prudent_unsupported" + href="#tbr_fnp_prudent_unsupported">Prudent mode is not supported + with <code>FixedWindowRollingPolicy</code>.</a> + + + Given that <code>FixedWindowRollingPolicy</code> performs + multiple file rename operations suring roll over, and that these + operations cannot be guaranteed to be safe in a multi-JVM context, + prudent mode is not allowed in conjuction with a + <code>FixedWindowRollingPolicy</code>. + + + <hr /> <a name="syslog_layout" href="#syslog_layout"> SyslogAppender - does not admit a layout parameter.</a> + does not admit a layout.</a> Modified: logback/trunk/logback-site/src/site/pages/manual/appenders.html ============================================================================== --- logback/trunk/logback-site/src/site/pages/manual/appenders.html (original) +++ logback/trunk/logback-site/src/site/pages/manual/appenders.html Wed Jul 8 10:24:27 2009 @@ -1166,8 +1166,10 @@ - <a name="TriggeringPolicy"></a> - <h3>Triggering policies</h3> + + <h3> + <a name="TriggeringPolicy" href="#TriggeringPolicy">Triggering policies</a> + </h3> <a href="../xref/ch/qos/logback/core/rolling/TriggeringPolicy.html"><code>TriggeringPolicy</code></a> @@ -1193,8 +1195,9 @@ rollover should occur or not, based on the said parameters. - <a name="SizeBasedTriggeringPolicy"></a> - <h4>SizeBasedTriggeringPolicy</h4> + + <h4><a name="SizeBasedTriggeringPolicy" + href="#SizeBasedTriggeringPolicy">SizeBasedTriggeringPolicy</a></h4> <a href="../xref/ch/qos/logback/core/rolling/SizeBasedTriggeringPolicy.html"> 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 Wed Jul 8 10:24:27 2009 @@ -79,6 +79,13 @@ 47465</a> Mark Thomas. + Fixed <a + href="http://jira.qos.ch/browse/LBCORE-94">LBCORE-94</a>. While + configuring a RollingFileAppender, if the File property is + declared after any rolling triggering policies, then logback will + now generate an error status message. + + <hr width="80%" align="center" /> <h3>12th of February 2009 - Release of version 0.9.15</h3>

1 0