April 2012 - logback-dev - mailman3.qos.ch

[JIRA] Created: (LBACCESS-30) Netty Support
by Brian Guan (JIRA) 24 Apr '12

24 Apr '12

Netty Support ------------- Key: LBACCESS-30 URL: http://jira.qos.ch/browse/LBACCESS-30 Project: logback-access Issue Type: New Feature Components: Other Environment: Netty Reporter: Brian Guan Assignee: Logback dev list I was looking for a Netty http access logging solution and found logback-access via Googling. Since you only have support for Tomcat and Jetty and other servlet container, I wonder if a Netty solution would be useful. Since Netty is NOT a container in the J2EE sense, it only allows programmatic extension by inserting channel handler(s) into its pipeline. I have coded an experimental toy project based on this design but without using Logback yet. Questions to the community: * are you using Netty? * would you envision people using Netty and wanting logback-access? * would you like to see Netty support as part of logback-access? -- 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-169) RollingFileAppender/TimeBasedRollingPolicy failing to ZIP files in different directory
by Tomasz Nurkiewicz (JIRA) 24 Apr '12

24 Apr '12

RollingFileAppender/TimeBasedRollingPolicy failing to ZIP files in different directory -------------------------------------------------------------------------------------- Key: LBCORE-169 URL: http://jira.qos.ch/browse/LBCORE-169 Project: logback-core Issue Type: Bug Components: Rolling Affects Versions: 0.9.24 Reporter: Tomasz Nurkiewicz Assignee: Logback dev list When using ZIP feature to compress old log files, Logback does not allow to put ZIP files in different directory like in this example: <file>logs\server.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <fileNamePattern>logs\arch\server.%d{yyyy-MM-dd_HHmm}.log.zip</fileNamePattern> </rollingPolicy> Running the attached test maven project (it takes 1 minute to run) will create server.log3560979839057.tmp (or similar) temporary file instead of ZIP file in /arch subdirectory (preferably this directory should be created if not exists). If fileNamePattern in rollingPolicy is changed to: "logs\server.%d{yyyy-MM-dd_HHmm}.log.zip" everything works as expected. The root of this issue is to be able to automatically ZIP files AND archive them in different directory. It would be great to be able to use date placeholders in folder names, for instance: <fileNamePattern>logs\arch-%d{yyyy-MM}\server.%d{yyyy-MM-dd_HHmm}.log.zip</fileNamePattern> so that Logback would automatically create folders for each month with ZIPped files. -- 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

8 9

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.1-26-gd886e9b
by git-noreply＠pixie.qos.ch 24 Apr '12

24 Apr '12

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 d886e9b0aa31036bf5bf5c5b78249afb50a80d6c (commit) from 560596f736cc1bf37171bd4d5d19dfc96a625550 (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=d886e9b0aa31036bf5bf5c5b… http://github.com/ceki/logback/commit/d886e9b0aa31036bf5bf5c5b78249afb50a80… commit d886e9b0aa31036bf5bf5c5b78249afb50a80d6c Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 24 19:50:59 2012 +0200 fix LBCORE-169 diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java index b5a05da..69d8b42 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBase.java @@ -55,7 +55,6 @@ abstract public class TimeBasedFileNamingAndTriggeringPolicyBase<E> extends + "'."); rc.printPeriodicity(this); - setDateInCurrentPeriod(new Date(getCurrentTime())); if (tbrp.getParentsRawFileProperty() != null) { File currentFile = new File(tbrp.getParentsRawFileProperty()); diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java index 0132322..5e139e1 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/Compressor.java @@ -22,14 +22,16 @@ import java.util.zip.GZIPOutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; +import ch.qos.logback.core.rolling.RolloverFailure; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.status.WarnStatus; +import ch.qos.logback.core.util.FileUtil; /** * The <code>Compression</code> class implements ZIP and GZ file * compression/decompression methods. - * + * * @author Ceki Gülcü */ public class Compressor extends ContextAwareBase { @@ -40,25 +42,22 @@ public class Compressor extends ContextAwareBase { this.compressionMode = compressionMode; } - /** - * - * @param nameOfFile2Compress - * @param nameOfCompressedFile - * @param innerEntryName The name of the file within the zip file. Use for ZIP compression. - */ + /** + * @param nameOfFile2Compress + * @param nameOfCompressedFile + * @param innerEntryName The name of the file within the zip file. Use for ZIP compression. + */ public void compress(String nameOfFile2Compress, String nameOfCompressedFile, String innerEntryName) { switch (compressionMode) { - case GZ: - addInfo("GZ compressing [" + nameOfFile2Compress + "]."); - gzCompress(nameOfFile2Compress, nameOfCompressedFile); - break; - case ZIP: - addInfo("ZIP compressing [" + nameOfFile2Compress + "]."); - zipCompress(nameOfFile2Compress, nameOfCompressedFile, innerEntryName); - break; - case NONE: - throw new UnsupportedOperationException( - "compress method called in NONE compression mode"); + case GZ: + gzCompress(nameOfFile2Compress, nameOfCompressedFile); + break; + case ZIP: + zipCompress(nameOfFile2Compress, nameOfCompressedFile, innerEntryName); + break; + case NONE: + throw new UnsupportedOperationException( + "compress method called in NONE compression mode"); } } @@ -67,12 +66,12 @@ public class Compressor extends ContextAwareBase { if (!file2zip.exists()) { addStatus(new WarnStatus("The file to compress named [" + nameOfFile2zip - + "] does not exist.", this)); + + "] does not exist.", this)); return; } - if(innerEntryName == null) { + if (innerEntryName == null) { addStatus(new WarnStatus("The innerEntryName parameter cannot be null", this)); return; } @@ -85,11 +84,14 @@ public class Compressor extends ContextAwareBase { if (zippedFile.exists()) { addStatus(new WarnStatus("The target compressed file named [" - + nameOfZippedFile + "] exist already.", this)); + + nameOfZippedFile + "] exist already.", this)); return; } + addInfo("ZIP compressing [" + file2zip + "] as ["+zippedFile+"]"); + createMissingTargetDirsIfNecessary(zippedFile); + BufferedInputStream bis = null; ZipOutputStream zos = null; try { @@ -113,20 +115,20 @@ public class Compressor extends ContextAwareBase { if (!file2zip.delete()) { addStatus(new WarnStatus("Could not delete [" + nameOfFile2zip + "].", - this)); + this)); } } catch (Exception e) { addStatus(new ErrorStatus("Error occurred while compressing [" - + nameOfFile2zip + "] into [" + nameOfZippedFile + "].", this, e)); + + nameOfFile2zip + "] into [" + nameOfZippedFile + "].", this, e)); } finally { - if(bis != null) { + if (bis != null) { try { bis.close(); } catch (IOException e) { // ignore } } - if(zos != null) { + if (zos != null) { try { zos.close(); } catch (IOException e) { @@ -168,11 +170,12 @@ public class Compressor extends ContextAwareBase { if (!file2gz.exists()) { addStatus(new WarnStatus("The file to compress named [" + nameOfFile2gz - + "] does not exist.", this)); + + "] does not exist.", this)); return; } + if (!nameOfgzedFile.endsWith(".gz")) { nameOfgzedFile = nameOfgzedFile + ".gz"; } @@ -180,12 +183,14 @@ public class Compressor extends ContextAwareBase { File gzedFile = new File(nameOfgzedFile); if (gzedFile.exists()) { - addStatus(new WarnStatus("The target compressed file named [" - + nameOfgzedFile + "] exist already.", this)); - + addWarn("The target compressed file named [" + + nameOfgzedFile + "] exist already. Aborting file compression."); return; } + addInfo("GZ compressing [" + file2gz + "] as ["+gzedFile+"]"); + createMissingTargetDirsIfNecessary(gzedFile); + BufferedInputStream bis = null; GZIPOutputStream gzos = null; try { @@ -205,20 +210,20 @@ public class Compressor extends ContextAwareBase { if (!file2gz.delete()) { addStatus(new WarnStatus("Could not delete [" + nameOfFile2gz + "].", - this)); + this)); } } catch (Exception e) { addStatus(new ErrorStatus("Error occurred while compressing [" - + nameOfFile2gz + "] into [" + nameOfgzedFile + "].", this, e)); + + nameOfFile2gz + "] into [" + nameOfgzedFile + "].", this, e)); } finally { - if(bis != null) { + if (bis != null) { try { bis.close(); } catch (IOException e) { // ignore } } - if(gzos != null) { + if (gzos != null) { try { gzos.close(); } catch (IOException e) { @@ -233,24 +238,38 @@ public class Compressor extends ContextAwareBase { int len = fileNamePatternStr.length(); switch (compressionMode) { case GZ: - if(fileNamePatternStr.endsWith(".gz")) - return fileNamePatternStr.substring(0, len - 3); - else - return fileNamePatternStr; + if (fileNamePatternStr.endsWith(".gz")) + return fileNamePatternStr.substring(0, len - 3); + else + return fileNamePatternStr; case ZIP: - if(fileNamePatternStr.endsWith(".zip")) - return fileNamePatternStr.substring(0, len - 4); - else - return fileNamePatternStr; + if (fileNamePatternStr.endsWith(".zip")) + return fileNamePatternStr.substring(0, len - 4); + else + return fileNamePatternStr; case NONE: return fileNamePatternStr; } throw new IllegalStateException("Execution should not reach this point"); } + + void createMissingTargetDirsIfNecessary(File file) { + if (FileUtil.isParentDirectoryCreationRequired(file)) { + boolean result = FileUtil.createMissingParentDirectories(file); + if (!result) { + addError("Failed to create parent directories for [" + + file.getAbsolutePath() + "]"); + } else { + addInfo("Created missing parent directories for [" + + file.getAbsolutePath() + "]"); + } + } + } + @Override public String toString() { - return "c.q.l.core.rolling.helper.Compress"; + return this.getClass().getName(); } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java b/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java index 536c1ba..1f21128 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java +++ b/logback-core/src/test/java/ch/qos/logback/core/util/Compare.java @@ -19,7 +19,11 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; +import java.util.Enumeration; import java.util.zip.GZIPInputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; +import java.util.zip.ZipInputStream; public class Compare { static final int B1_NULL = -1; @@ -27,8 +31,9 @@ public class Compare { public static boolean compare(String file1, String file2) throws FileNotFoundException, IOException { if (file1.endsWith(".gz")) { - //System.out.println(file1 +" is a gz file"); return gzFileCompare(file1, file2); + } else if(file1.endsWith(".zip")) { + return zipFileCompare(file1, file2); } else { return regularFileCompare(file1, file2); } @@ -39,13 +44,24 @@ public class Compare { GZIPInputStream gzis = new GZIPInputStream(fis); return new BufferedReader(new InputStreamReader(gzis)); } - + + static BufferedReader zipFileToBufferedReader(String file) throws IOException { + FileInputStream fis = new FileInputStream(file); + ZipInputStream zis = new ZipInputStream(fis); + zis.getNextEntry(); + return new BufferedReader(new InputStreamReader(zis)); + } public static boolean gzFileCompare(String file1, String file2) throws IOException { BufferedReader in1 = gzFileToBufferedReader(file1); BufferedReader in2 = gzFileToBufferedReader(file2); return bufferCompare(in1, in2, file1, file2); } + public static boolean zipFileCompare(String file1, String file2) throws IOException { + BufferedReader in1 = zipFileToBufferedReader(file1); + BufferedReader in2 = zipFileToBufferedReader(file2); + return bufferCompare(in1, in2, file1, file2); + } public static boolean regularFileCompare(String file1, String file2) throws FileNotFoundException, IOException { BufferedReader in1 = new BufferedReader(new FileReader(file1)); diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala index b88b50b..0f54d19 100644 --- a/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala +++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/RollingScaffolding.scala @@ -6,7 +6,7 @@ * either the terms of the Eclipse Public License v1.0 as published by * the Eclipse Foundation * - * or (per the licensee's choosing) + * or (per the licensee's choosing) * * under the terms of the GNU Lesser General Public License version 2.1 * as published by the Free Software Foundation. @@ -14,7 +14,7 @@ package ch.qos.logback.core.rolling import ch.qos.logback.core.{ContextBase, Context} -import helper.FileFilterUtil +import helper.{FileNamePattern, FileFilterUtil} import java.util.concurrent.TimeUnit import ch.qos.logback.core.util.{CachingDateFormatter, CoreTestConstants} import org.junit.Assert._ @@ -29,7 +29,7 @@ trait RollingScaffolding { val context: Context = new ContextBase val sm = context.getStatusManager() - + var diff: Int = RandomUtil.getPositiveInt protected var currentTime: Long = 0L @@ -63,24 +63,23 @@ trait RollingScaffolding { return new Date(currentTime - delta) } - protected def addExpectedFileName_ByDate(outputDir: String, testId: String, millis: Long, gzExtension: Boolean): Unit = { - var fn: String = outputDir + testId + "-" + SDF.format(millis) - if (gzExtension) { - fn += ".gz" - } + protected def addExpectedFileName_ByDate(patternStr: String, millis: Long): Unit = { + val fileNamePattern = new FileNamePattern(patternStr, context) + var fn: String = fileNamePattern.convert(new Date(millis)) + println("fn=" + fn) expectedFilenameList = expectedFilenameList ::: List(fn) } protected def addExpectedFileName_ByFileIndexCounter(randomOutputDir: String, testId: String, millis: Long, fileIndexCounter: Int, compressionSuffix: String): Unit = { - var fn: String = randomOutputDir + testId + "-" + SDF.format(millis) + "-" + fileIndexCounter + ".txt"+compressionSuffix + var fn: String = randomOutputDir + testId + "-" + SDF.format(millis) + "-" + fileIndexCounter + ".txt" + compressionSuffix expectedFilenameList = expectedFilenameList ::: List(fn) } - - protected def addExpectedFileNamedIfItsTime_ByDate(outputDir: String, testId: String, gzExtension: Boolean): Unit = { + + protected def addExpectedFileNamedIfItsTime_ByDate(fileNamePatternStr: String): Unit = { if (passThresholdTime(nextRolloverThreshold)) { - addExpectedFileName_ByDate(outputDir, testId, getMillisOfCurrentPeriodsStart, gzExtension) + addExpectedFileName_ByDate(fileNamePatternStr, getMillisOfCurrentPeriodsStart) recomputeRolloverThreshold(currentTime) } } @@ -112,9 +111,16 @@ trait RollingScaffolding { // ========================================================================= // utility methods // ========================================================================= - private[rolling] def massageExpectedFilesToCorresponToCurrentTarget(file: String): Unit = { + private[rolling] def massageExpectedFilesToCorresponToCurrentTarget(file: String, fileOptionIsSet: Boolean): Unit = { + val last: String = expectedFilenameList.last expectedFilenameList = expectedFilenameList.dropRight(1) - expectedFilenameList = expectedFilenameList ::: List(file) + + if (fileOptionIsSet) { + expectedFilenameList = expectedFilenameList ::: List(file) + } else if (last.endsWith(".gz")) { + val stem = last.dropRight(3) + expectedFilenameList = expectedFilenameList ::: List(stem) + } } def existenceCheck(filenameList: List[String]): Unit = { @@ -133,7 +139,7 @@ trait RollingScaffolding { FileFilterUtil.sortFileArrayByName(fileArray) fileContentCheck(fileArray, runLength, prefix) } - + def reverseSortedContentCheck(outputDirStr: String, runLength: Int, prefix: String) { var fileArray: Array[File] = getFilesInDirectory(outputDirStr) FileFilterUtil.reverseSortFileArrayByName(fileArray) diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_STest.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_STest.scala index 370323f..00caf98 100644 --- a/logback-core/src/test/scala/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_STest.scala +++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP_STest.scala @@ -106,9 +106,9 @@ class SizeAndTimeBasedFNATP_STest extends RollingScaffolding { secondPhase runLength = runLength*2 } - + if (stem != null) - massageExpectedFilesToCorresponToCurrentTarget(file) + massageExpectedFilesToCorresponToCurrentTarget(file, true) Thread.sleep(20) // wait for compression to finish diff --git a/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala b/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala index c2d8aa4..ce09a22 100644 --- a/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala +++ b/logback-core/src/test/scala/ch/qos/logback/core/rolling/TimeBasedRolling_STest.scala @@ -57,23 +57,24 @@ class TimeBasedRolling_STest extends RollingScaffolding { } type CheckFunction = ((String, Boolean, String) => Unit) - def genericTest(checkFunction: CheckFunction)(testId: String, compressionSuffix: String, fileOptionIsSet: Boolean, waitDuration: Int): Unit = { + def genericTest(checkFunction: CheckFunction)(testId: String, patternPrefix: String, compressionSuffix: String, fileOptionIsSet: Boolean, waitDuration: Int): Unit = { val withCompression = compressionSuffix.length > 0 val fileName = if (fileOptionIsSet) testId2FileName(testId) else null; initRFA(rfa1, fileName); - initTRBP(rfa1, tbrp1, randomOutputDir + testId + "-%d{" - + DATE_PATTERN_WITH_SECONDS + "}" + compressionSuffix, currentTime); + val fileNamePatternStr = randomOutputDir + patternPrefix + "-%d{"+ DATE_PATTERN_WITH_SECONDS + "}"+compressionSuffix + + initTRBP(rfa1, tbrp1, fileNamePatternStr, currentTime); // compute the current filename - addExpectedFileName_ByDate(randomOutputDir, testId, getMillisOfCurrentPeriodsStart, withCompression); + addExpectedFileName_ByDate(fileNamePatternStr, getMillisOfCurrentPeriodsStart); incCurrentTime(1100); tbrp1.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime); for (i <- 0 until 3) { rfa1.doAppend("Hello---" + i); - addExpectedFileNamedIfItsTime_ByDate(randomOutputDir, testId, withCompression && (i != 2)) + addExpectedFileNamedIfItsTime_ByDate(fileNamePatternStr) //, withCompression && (i != 2)) incCurrentTime(500); tbrp1.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime) if (withCompression) @@ -82,13 +83,12 @@ class TimeBasedRolling_STest extends RollingScaffolding { rfa1.stop if (waitDuration != NO_RESTART) { - doRestart(testId, fileOptionIsSet, waitDuration); + doRestart(testId, patternPrefix, fileOptionIsSet, waitDuration); } - if (fileOptionIsSet) { - massageExpectedFilesToCorresponToCurrentTarget(fileName) - } + massageExpectedFilesToCorresponToCurrentTarget(fileName, fileOptionIsSet) + StatusPrinter.print(context) checkFunction(testId, withCompression, compressionSuffix) } @@ -114,19 +114,21 @@ class TimeBasedRolling_STest extends RollingScaffolding { - def doRestart(testId: String, fileOptionIsSet: Boolean, waitDuration: Int) { + def doRestart(testId: String, patternPart: String, fileOptionIsSet: Boolean, waitDuration: Int) { // change the timestamp of the currently actively file var activeFile: File = new File(rfa1.getFile) activeFile.setLastModified(currentTime) incCurrentTime(waitDuration) + val filePatternStr = randomOutputDir + patternPart + "-%d{" + DATE_PATTERN_WITH_SECONDS + "}" + val fileName = if (fileOptionIsSet) testId2FileName(testId) else null; initRFA(rfa2, fileName) - initTRBP(rfa2, tbrp2, randomOutputDir + testId + "-%d{" + DATE_PATTERN_WITH_SECONDS + "}", currentTime) + initTRBP(rfa2, tbrp2, filePatternStr, currentTime) for (i <- 0 until 3) { rfa2.doAppend("World---" + i) - addExpectedFileNamedIfItsTime_ByDate(randomOutputDir, testId, false) + addExpectedFileNamedIfItsTime_ByDate(filePatternStr) incCurrentTime(100) tbrp2.timeBasedFileNamingAndTriggeringPolicy.setCurrentTime(currentTime) } @@ -138,44 +140,49 @@ class TimeBasedRolling_STest extends RollingScaffolding { @Test def noCompression_FileBlank_NoRestart_1 = { - defaultTest("test1", "", FILE_OPTION_BLANK, NO_RESTART) + defaultTest("test1", "test1", "", FILE_OPTION_BLANK, NO_RESTART) } @Test def withCompression_FileBlank_NoRestart_2 = { - defaultTest("test2", ".gz", FILE_OPTION_BLANK, NO_RESTART); + defaultTest("test2", "test2", ".gz", FILE_OPTION_BLANK, NO_RESTART); } @Test def noCompression_FileBlank_StopRestart_3 = { - defaultTest("test3", "", FILE_OPTION_BLANK, WITH_RESTART); + defaultTest("test3", "test3", "", FILE_OPTION_BLANK, WITH_RESTART); } @Test def noCompression_FileSet_StopRestart_4 = { - defaultTest("test4", "", FILE_OPTION_SET, WITH_RESTART); + defaultTest("test4", "test4", "", FILE_OPTION_SET, WITH_RESTART); } @Test def noCompression_FileSet_StopRestart_WithLongWait_4B = { - defaultTest("test4B", "", FILE_OPTION_SET, WITH_RESTART_AND_LONG_WAIT); + defaultTest("test4B", "test4B", "", FILE_OPTION_SET, WITH_RESTART_AND_LONG_WAIT); } @Test def noCompression_FileSet_NoRestart_5 = { - defaultTest("test5", "", FILE_OPTION_SET, NO_RESTART); + defaultTest("test5", "test6", "", FILE_OPTION_SET, NO_RESTART); } @Test def withCompression_FileSet_NoRestart_6 = { - defaultTest("test6", ".gz", FILE_OPTION_SET, NO_RESTART); + defaultTest("test6", "test6", ".gz", FILE_OPTION_SET, NO_RESTART); } + // LBCORE-169 @Test - def withMissingTargetDir = { - defaultTest("missingTargetDir", "", FILE_OPTION_SET, NO_RESTART); + def withMissingTargetDirWithCompression = { + defaultTest("test7", "%d{yyyy-MM-dd, aux}/", ".gz", FILE_OPTION_SET, NO_RESTART); } + @Test + def withMissingTargetDirWithZipCompression = { + defaultTest("test8", "%d{yyyy-MM-dd, aux}/", ".zip", FILE_OPTION_SET, NO_RESTART); + } @Test def failed_rename: Unit = { @@ -188,7 +195,7 @@ class TimeBasedRolling_STest extends RollingScaffolding { file.getParentFile.mkdirs fos = new FileOutputStream(fileName) - genericTest(zCheck)("failed_rename", "", FILE_OPTION_SET, NO_RESTART) + genericTest(zCheck)("failed_rename", "failed_rename", "", FILE_OPTION_SET, NO_RESTART) } finally { StatusPrinter.print(context) diff --git a/logback-core/src/test/witness/rolling/tbr-missingTargetDir.0 b/logback-core/src/test/witness/rolling/tbr-missingTargetDir.0 deleted file mode 100644 index e69de29..0000000 diff --git a/logback-core/src/test/witness/rolling/tbr-missingTargetDir.1 b/logback-core/src/test/witness/rolling/tbr-missingTargetDir.1 deleted file mode 100644 index aea23e8..0000000 --- a/logback-core/src/test/witness/rolling/tbr-missingTargetDir.1 +++ /dev/null @@ -1,2 +0,0 @@ -Hello---0 -Hello---1 \ No newline at end of file diff --git a/logback-core/src/test/witness/rolling/tbr-test7.0.gz b/logback-core/src/test/witness/rolling/tbr-test7.0.gz new file mode 100644 index 0000000..001322f Binary files /dev/null and b/logback-core/src/test/witness/rolling/tbr-test7.0.gz differ diff --git a/logback-core/src/test/witness/rolling/tbr-test7.1.gz b/logback-core/src/test/witness/rolling/tbr-test7.1.gz new file mode 100644 index 0000000..1a80ee1 Binary files /dev/null and b/logback-core/src/test/witness/rolling/tbr-test7.1.gz differ diff --git a/logback-core/src/test/witness/rolling/tbr-missingTargetDir.2 b/logback-core/src/test/witness/rolling/tbr-test7.2 similarity index 100% copy from logback-core/src/test/witness/rolling/tbr-missingTargetDir.2 copy to logback-core/src/test/witness/rolling/tbr-test7.2 diff --git a/logback-core/src/test/witness/rolling/tbr-test8.0.zip b/logback-core/src/test/witness/rolling/tbr-test8.0.zip new file mode 100644 index 0000000..0191c2a Binary files /dev/null and b/logback-core/src/test/witness/rolling/tbr-test8.0.zip differ diff --git a/logback-core/src/test/witness/rolling/tbr-test8.1.zip b/logback-core/src/test/witness/rolling/tbr-test8.1.zip new file mode 100644 index 0000000..621f821 Binary files /dev/null and b/logback-core/src/test/witness/rolling/tbr-test8.1.zip differ diff --git a/logback-core/src/test/witness/rolling/tbr-missingTargetDir.2 b/logback-core/src/test/witness/rolling/tbr-test8.2 similarity index 100% rename from logback-core/src/test/witness/rolling/tbr-missingTargetDir.2 rename to logback-core/src/test/witness/rolling/tbr-test8.2 ----------------------------------------------------------------------- Summary of changes: ...TimeBasedFileNamingAndTriggeringPolicyBase.java | 1 - .../logback/core/rolling/helper/Compressor.java | 103 ++++++++++++-------- .../java/ch/qos/logback/core/util/Compare.java | 20 ++++- .../logback/core/rolling/RollingScaffolding.scala | 36 ++++--- .../core/rolling/SizeAndTimeBasedFNATP_STest.scala | 4 +- .../core/rolling/TimeBasedRolling_STest.scala | 51 ++++++---- .../test/witness/rolling/tbr-missingTargetDir.1 | 2 - .../rolling/{tbr-test2.0.gz => tbr-test7.0.gz} | Bin 20 -> 20 bytes .../src/test/witness/rolling/tbr-test7.1.gz | Bin 0 -> 36 bytes .../{tbr-missingTargetDir.2 => tbr-test7.2} | 0 .../src/test/witness/rolling/tbr-test8.0.zip | Bin 0 -> 156 bytes .../src/test/witness/rolling/tbr-test8.1.zip | Bin 0 -> 172 bytes .../{tbr-missingTargetDir.2 => tbr-test8.2} | 0 13 files changed, 131 insertions(+), 86 deletions(-) delete mode 100644 logback-core/src/test/witness/rolling/tbr-missingTargetDir.0 delete mode 100644 logback-core/src/test/witness/rolling/tbr-missingTargetDir.1 copy logback-core/src/test/witness/rolling/{tbr-test2.0.gz => tbr-test7.0.gz} (100%) create mode 100644 logback-core/src/test/witness/rolling/tbr-test7.1.gz copy logback-core/src/test/witness/rolling/{tbr-missingTargetDir.2 => tbr-test7.2} (100%) create mode 100644 logback-core/src/test/witness/rolling/tbr-test8.0.zip create mode 100644 logback-core/src/test/witness/rolling/tbr-test8.1.zip rename logback-core/src/test/witness/rolling/{tbr-missingTargetDir.2 => tbr-test8.2} (100%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-84) Typo in PropertyAction
by Michael Franz (JIRA) 24 Apr '12

24 Apr '12

Typo in PropertyAction ---------------------- Key: LBCORE-84 URL: http://jira.qos.ch/browse/LBCORE-84 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.14 Reporter: Michael Franz Assignee: Logback dev list Priority: Trivial The following message is printed |-WARN in ch.qos.logback.core.joran.action.PropertyAction - [substitutionProperty] element has been deprecated. Plase use the [property] element instead. There an 'e' missing in "Please". -- 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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.1-25-g560596f
by git-noreply＠pixie.qos.ch 24 Apr '12

24 Apr '12

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 560596f736cc1bf37171bd4d5d19dfc96a625550 (commit) via 3137fd970b900bbc2ae7554a57ab7df637fcb2e5 (commit) via e102325d3d3f696220f89fb37950a01ae7c3c948 (commit) from 4a2525be2fc34ffb6fcf3b0de8d0e01d821440fd (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=560596f736cc1bf37171bd4d… http://github.com/ceki/logback/commit/560596f736cc1bf37171bd4d5d19dfc96a625… commit 560596f736cc1bf37171bd4d5d19dfc96a625550 Merge: 4a2525b 3137fd9 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 24 05:49:58 2012 -0700 Merge pull request #45 from CodingFabian/propertyaction-handle-filenotfound-gracefully Propertyaction handle filenotfound gracefully http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=3137fd970b900bbc2ae7554a… http://github.com/ceki/logback/commit/3137fd970b900bbc2ae7554a57ab7df637fcb… commit 3137fd970b900bbc2ae7554a57ab7df637fcb2e5 Author: Fabian Lange <lange.fabian(a)gmail.com> Date: Tue Apr 24 12:00:56 2012 +0200 PropertyAction will no longer print a full stack trace when the referenced file is not found. Sometimes those files referenced are optional, and a full stack trace does not contain additional information in that case. Resources already follow that principle to print a "Not Found" message without stacktrace when it cannot be found and only the stacktrace when there is a problem reading a found resource. diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java index 2d93a4f..ba85164 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java @@ -22,6 +22,7 @@ import ch.qos.logback.core.util.Loader; import ch.qos.logback.core.util.OptionHelper; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -101,8 +102,10 @@ public class PropertyAction extends Action { try { FileInputStream istream = new FileInputStream(file); loadAndSetProperties(ec, istream, scope); - } catch (IOException e) { - addError("Could not read properties file [" + file + "].", e); + } catch (FileNotFoundException e) { + addError("Could not find properties file [" + file + "]."); + } catch (IOException e1) { + addError("Could not read properties file [" + file + "].", e1); } } else if (checkResourceAttributeSanity(attributes)) { String resource = attributes.getValue(RESOURCE_ATTRIBUTE); diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java index d4b5133..8d2f20f 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/PropertyActionTest.java @@ -156,6 +156,6 @@ public class PropertyActionTest { private boolean checkFileErrors() { Iterator it = context.getStatusManager().getCopyOfStatusList().iterator(); ErrorStatus es1 = (ErrorStatus)it.next(); - return "Could not read properties file [toto].".equals(es1.getMessage()); + return "Could not find properties file [toto].".equals(es1.getMessage()); } } http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=e102325d3d3f696220f89fb3… http://github.com/ceki/logback/commit/e102325d3d3f696220f89fb37950a01ae7c3c… commit e102325d3d3f696220f89fb37950a01ae7c3c948 Author: Fabian Lange <lange.fabian(a)gmail.com> Date: Tue Apr 24 11:56:44 2012 +0200 fixed LBCORE-84 - typo in PropertyAction.java diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java index 4d2f076..2d93a4f 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/PropertyAction.java @@ -86,7 +86,7 @@ public class PropertyAction extends Action { Attributes attributes) { if ("substitutionProperty".equals(localName)) { - addWarn("[substitutionProperty] element has been deprecated. Plase use the [property] element instead."); + addWarn("[substitutionProperty] element has been deprecated. Please use the [property] element instead."); } String name = attributes.getValue(NAME_ATTRIBUTE); ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/action/PropertyAction.java | 9 ++++++--- .../core/joran/action/PropertyActionTest.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-254) Logback cannot read system properties configured in Maven Jetty Plugin
by Erle Czar Mantos (JIRA) 24 Apr '12

24 Apr '12

Logback cannot read system properties configured in Maven Jetty Plugin ---------------------------------------------------------------------- Key: LBCORE-254 URL: http://jira.qos.ch/browse/LBCORE-254 Project: logback-core Issue Type: Bug Reporter: Erle Czar Mantos Assignee: Logback dev list I have a system property configured in the maven jetty plugin, as follows: <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> <version>6.1.10</version> <configuration> <systemProperties> <systemProperty> <name>project.home</name> <value>D:</value> </systemProperty> </systemProperties> .... </configuration> </plugin> If I use this system property in logback -- <property file="${project.home}/foo/bar/baz/app.properties"/> This system property is UNDEFINED when I run the webapp via mvn jetty:run. The rest of the system (spring configuration files, etc) can happily use the project.home system property except for logback. The only way to run jetty now, with the correct substitution is through: mvn jetty:run "-Dproject.home=D:" -- 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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch master updated. v_1.0.1-22-g4a2525b
by git-noreply＠pixie.qos.ch 24 Apr '12

24 Apr '12

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 4a2525be2fc34ffb6fcf3b0de8d0e01d821440fd (commit) via 43072a410f56e2340d3ebc1f5bfeddd2324930cb (commit) from 79238b71e41c49902ec6426335fe08302920eea2 (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=4a2525be2fc34ffb6fcf3b0d… http://github.com/ceki/logback/commit/4a2525be2fc34ffb6fcf3b0de8d0e01d82144… commit 4a2525be2fc34ffb6fcf3b0de8d0e01d821440fd Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 24 10:57:54 2012 +0200 comments diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index a63a070..ec0f635 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -437,6 +437,7 @@ public class JoranConfiguratorTest { } + // see also http://jira.qos.ch/browse/LBCORE-254 @Test public void sysProps() throws JoranException { System.setProperty("k.lbcore254", ClassicTestConstants.ISSUES_PREFIX+"lbcore254"); @@ -445,6 +446,5 @@ public class JoranConfiguratorTest { configurator.doConfigure(ClassicTestConstants.ISSUES_PREFIX+"lbcore254.xml"); checker.isErrorFree(0); - - } + } } http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=43072a410f56e2340d3ebc1f… http://github.com/ceki/logback/commit/43072a410f56e2340d3ebc1f5bfeddd232493… commit 43072a410f56e2340d3ebc1f5bfeddd2324930cb Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 24 10:54:07 2012 +0200 move lbcore-254 related 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 39ac65f..2bf6282 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 @@ -24,6 +24,7 @@ public class ClassicTestConstants { 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/"; + final static public String ISSUES_PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX+"issues/"; final static public String GAFFER_INPUT_PREFIX = INPUT_PREFIX + "gaffer/"; final static public String OUTPUT_DIR_PREFIX= CoreTestConstants.OUTPUT_DIR_PREFIX; } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java deleted file mode 100644 index f2686f4..0000000 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java +++ /dev/null @@ -1,34 +0,0 @@ -package ch.qos.logback.classic.issue; - -import ch.qos.logback.classic.ClassicTestConstants; -import ch.qos.logback.classic.LoggerContext; -import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.joran.spi.JoranException; -import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.util.StatusPrinter; -import org.junit.Before; -import org.junit.Test; - -public class LBCORE_254 { - - static String ISSUES_PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX+"issues/"; - LoggerContext context = new LoggerContext(); - - StatusChecker checker = new StatusChecker(context); - - @Before - public void setUp() { - context.start(); - } - - @Test - public void sysProps() throws JoranException { - System.setProperty("k.lbcore254", ISSUES_PREFIX+"lbcore254"); - JoranConfigurator configurator = new JoranConfigurator(); - configurator.setContext(context); - configurator.doConfigure(ISSUES_PREFIX+"lbcore254.xml"); - - checker.isErrorFree(0); - - } -} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java index 579280f..fdd41f5 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java @@ -21,7 +21,6 @@ import ch.qos.logback.classic.issue.lbclassic135.lbclassic139.LB139_DeadlockTest @RunWith(Suite.class) @SuiteClasses({LB139_DeadlockTest.class, - LBCORE_254.class, ch.qos.logback.classic.issue.lbclassic135.lbclassic139.PackageTest.class, ch.qos.logback.classic.issue.lbclassic203.PackageTest.class}) public class PackageTest { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 7ac50b6..a63a070 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -54,7 +54,7 @@ public class JoranConfiguratorTest { LoggerContext loggerContext = new LoggerContext(); Logger logger = loggerContext.getLogger(this.getClass().getName()); Logger root = loggerContext.getLogger(Logger.ROOT_LOGGER_NAME); - StatusChecker sc = new StatusChecker(loggerContext); + StatusChecker checker = new StatusChecker(loggerContext); int diff = RandomUtil.getPositiveInt(); void configure(String file) throws JoranException { @@ -409,13 +409,12 @@ public class JoranConfiguratorTest { @Test public void lbcore193() throws JoranException { - String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "issues/lbcore193.xml"; + String configFileAsStr = ClassicTestConstants.ISSUES_PREFIX + "lbcore193.xml"; configure(configFileAsStr); - StatusPrinter.print(loggerContext); - sc.containsException(ScanException.class); - sc.containsMatch(Status.ERROR, "Expecting RIGHT_PARENTHESIS token but got null"); - sc.containsMatch(Status.ERROR, "See also " + Parser.MISSING_RIGHT_PARENTHESIS); + //StatusPrinter.print(loggerContext); + checker.containsException(ScanException.class); + checker.containsMatch(Status.ERROR, "Expecting RIGHT_PARENTHESIS token but got null"); + checker.containsMatch(Status.ERROR, "See also " + Parser.MISSING_RIGHT_PARENTHESIS); } @@ -433,7 +432,19 @@ public class JoranConfiguratorTest { assertEquals("node0", loggerContext.getProperty("nodeId")); assertEquals("tem", System.getProperty("sys")); assertNotNull(loggerContext.getProperty("path")); - assertTrue(sc.isErrorFree(0)); + assertTrue(checker.isErrorFree(0)); StatusPrinter.print(loggerContext); } + + + @Test + public void sysProps() throws JoranException { + System.setProperty("k.lbcore254", ClassicTestConstants.ISSUES_PREFIX+"lbcore254"); + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(loggerContext); + configurator.doConfigure(ClassicTestConstants.ISSUES_PREFIX+"lbcore254.xml"); + + checker.isErrorFree(0); + + } } ----------------------------------------------------------------------- Summary of changes: .../qos/logback/classic/ClassicTestConstants.java | 1 + .../ch/qos/logback/classic/issue/LBCORE_254.java | 34 -------------------- .../ch/qos/logback/classic/issue/PackageTest.java | 1 - .../classic/joran/JoranConfiguratorTest.java | 27 +++++++++++----- 4 files changed, 20 insertions(+), 43 deletions(-) delete mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java 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_1.0.1-20-g79238b7
by git-noreply＠pixie.qos.ch 24 Apr '12

24 Apr '12

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 79238b71e41c49902ec6426335fe08302920eea2 (commit) from 2931b6cb282e626ee7ff827f8ae02afe5c9e8172 (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=79238b71e41c49902ec64263… http://github.com/ceki/logback/commit/79238b71e41c49902ec6426335fe08302920e… commit 79238b71e41c49902ec6426335fe08302920eea2 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 24 10:44:27 2012 +0200 added test for LBCORE_254 diff --git a/logback-classic/src/test/input/joran/lbcore193.xml b/logback-classic/src/test/input/joran/issues/lbcore193.xml similarity index 100% rename from logback-classic/src/test/input/joran/lbcore193.xml rename to logback-classic/src/test/input/joran/issues/lbcore193.xml diff --git a/logback-classic/src/test/input/joran/issues/lbcore254.properties b/logback-classic/src/test/input/joran/issues/lbcore254.properties new file mode 100644 index 0000000..985fc4b --- /dev/null +++ b/logback-classic/src/test/input/joran/issues/lbcore254.properties @@ -0,0 +1 @@ +k0=v0 \ No newline at end of file diff --git a/logback-classic/src/test/input/joran/issues/lbcore254.xml b/logback-classic/src/test/input/joran/issues/lbcore254.xml new file mode 100644 index 0000000..7c4b308 --- /dev/null +++ b/logback-classic/src/test/input/joran/issues/lbcore254.xml @@ -0,0 +1,4 @@ +<configuration> + + <property file="${k.lbcore254}.properties"/> +</configuration> \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java new file mode 100644 index 0000000..f2686f4 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java @@ -0,0 +1,34 @@ +package ch.qos.logback.classic.issue; + +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.status.StatusChecker; +import ch.qos.logback.core.util.StatusPrinter; +import org.junit.Before; +import org.junit.Test; + +public class LBCORE_254 { + + static String ISSUES_PREFIX = ClassicTestConstants.JORAN_INPUT_PREFIX+"issues/"; + LoggerContext context = new LoggerContext(); + + StatusChecker checker = new StatusChecker(context); + + @Before + public void setUp() { + context.start(); + } + + @Test + public void sysProps() throws JoranException { + System.setProperty("k.lbcore254", ISSUES_PREFIX+"lbcore254"); + JoranConfigurator configurator = new JoranConfigurator(); + configurator.setContext(context); + configurator.doConfigure(ISSUES_PREFIX+"lbcore254.xml"); + + checker.isErrorFree(0); + + } +} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java index e47444f..579280f 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/issue/PackageTest.java @@ -20,8 +20,9 @@ import org.junit.runners.Suite.SuiteClasses; import ch.qos.logback.classic.issue.lbclassic135.lbclassic139.LB139_DeadlockTest; @RunWith(Suite.class) -@SuiteClasses( { LB139_DeadlockTest.class, - ch.qos.logback.classic.issue.lbclassic135.lbclassic139.PackageTest.class, - ch.qos.logback.classic.issue.lbclassic203.PackageTest.class }) +(a)SuiteClasses({LB139_DeadlockTest.class, + LBCORE_254.class, + ch.qos.logback.classic.issue.lbclassic135.lbclassic139.PackageTest.class, + ch.qos.logback.classic.issue.lbclassic203.PackageTest.class}) public class PackageTest { } \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java index 22db069..7ac50b6 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/JoranConfiguratorTest.java @@ -410,7 +410,7 @@ public class JoranConfiguratorTest { @Test public void lbcore193() throws JoranException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "lbcore193.xml"; + + "issues/lbcore193.xml"; configure(configFileAsStr); StatusPrinter.print(loggerContext); sc.containsException(ScanException.class); ----------------------------------------------------------------------- Summary of changes: .../test/input/joran/{ => issues}/lbcore193.xml | 0 .../test/input/joran/issues/lbcore254.properties | 1 + .../src/test/input/joran/issues/lbcore254.xml | 4 ++ .../ch/qos/logback/classic/issue/LBCORE_254.java | 34 ++++++++++++++++++++ .../ch/qos/logback/classic/issue/PackageTest.java | 7 ++-- .../classic/joran/JoranConfiguratorTest.java | 2 +- 6 files changed, 44 insertions(+), 4 deletions(-) rename logback-classic/src/test/input/joran/{ => issues}/lbcore193.xml (100%) create mode 100644 logback-classic/src/test/input/joran/issues/lbcore254.properties create mode 100644 logback-classic/src/test/input/joran/issues/lbcore254.xml create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/issue/LBCORE_254.java 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_1.0.1-19-g2931b6c
by git-noreply＠pixie.qos.ch 22 Apr '12

22 Apr '12

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 2931b6cb282e626ee7ff827f8ae02afe5c9e8172 (commit) from 7c700af7b2a87bd0344af92931ecc2e413e3ea87 (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=2931b6cb282e626ee7ff827f… http://github.com/ceki/logback/commit/2931b6cb282e626ee7ff827f8ae02afe5c9e8… commit 2931b6cb282e626ee7ff827f8ae02afe5c9e8172 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sun Apr 22 19:06:12 2012 +0200 minor edits diff --git a/logback-site/src/site/pages/manual/appenders.html b/logback-site/src/site/pages/manual/appenders.html index 56cf6f9..de31c49 100644 --- a/logback-site/src/site/pages/manual/appenders.html +++ b/logback-site/src/site/pages/manual/appenders.html @@ -797,15 +797,15 @@ public interface RollingPolicy extends LifeCycle { The date-and-time pattern, as found within the accolades of %d{} follow java.text.SimpleDateFormat conventions. The forward slash '/' or backward slash '\' characters anywhere - within the fileNamePattern property or within the - date-and-time pattern will be interpreted as directory - separators. + within the fileNamePattern + property or within the date-and-time pattern will be + interpreted as directory separators. It is possible to specify multiple %d tokens but only one of which can be primary, i.e. used to infer the rollover period. All other tokens must be marked as auxiliary - by passing the AUX paramater (see examples below). + by passing the 'aux' parameter (see examples below). </td> </tr> <tr> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/manual/appenders.html | 8 ++++---- 1 files changed, 4 insertions(+), 4 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_1.0.1-18-g7c700af
by git-noreply＠pixie.qos.ch 22 Apr '12

22 Apr '12

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 7c700af7b2a87bd0344af92931ecc2e413e3ea87 (commit) from 8646e9a3a29560176174aed181dbbd93de56c49f (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=7c700af7b2a87bd0344af929… http://github.com/ceki/logback/commit/7c700af7b2a87bd0344af92931ecc2e413e3e… commit 7c700af7b2a87bd0344af92931ecc2e413e3ea87 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sun Apr 22 18:30:38 2012 +0200 minor refactorings, edits diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java index e184610..e97ceb3 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/MDCConverter.java @@ -45,27 +45,34 @@ public class MDCConverter extends ClassicConverter { } if (key == null) { - // if no key is specified, return all the - // values present in the MDC, separated with a single space. - StringBuilder buf = new StringBuilder(); - boolean first = true; - for(Map.Entry<String, String> entry : mdcPropertyMap.entrySet()) { - if(first) { - first = false; - } else { - buf.append(", "); - } - //format: {testKey=testValue, testKey2=testValue2} - buf.append(entry.getKey()).append('=').append(entry.getValue()); + return outputMDCForAllKeys(mdcPropertyMap); + } else { + + String value = event.getMDCPropertyMap().get(key); + if (value != null) { + return value; + } else { + return EMPTY_STRING; } - return buf.toString(); } + } - String value = event.getMDCPropertyMap().get(key); - if (value != null) { - return value; - } else { - return EMPTY_STRING; + /** + * if no key is specified, return all the values present in the MDC, in the format "k1=v1, k2=v2, ..." + */ + + private String outputMDCForAllKeys(Map<String, String> mdcPropertyMap) { + StringBuilder buf = new StringBuilder(); + boolean first = true; + for (Map.Entry<String, String> entry : mdcPropertyMap.entrySet()) { + if (first) { + first = false; + } else { + buf.append(", "); + } + //format: key0=value0, key1=value1 + buf.append(entry.getKey()).append('=').append(entry.getValue()); } + return buf.toString(); } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java index 10fd4bc..d13f761 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/Converter.java @@ -29,7 +29,7 @@ abstract public class Converter<E> { * * @param event */ - public abstract String convert(E event); + public abstract String convert(E event); /** * In its simplest incarnation, a convert simply appends the data extracted from diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java index 081553d..8e766d6 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/Compiler.java @@ -15,7 +15,10 @@ package ch.qos.logback.core.pattern.parser; import java.util.Map; -import ch.qos.logback.core.pattern.*; +import ch.qos.logback.core.pattern.CompositeConverter; +import ch.qos.logback.core.pattern.Converter; +import ch.qos.logback.core.pattern.DynamicConverter; +import ch.qos.logback.core.pattern.LiteralConverter; import ch.qos.logback.core.spi.ContextAwareBase; import ch.qos.logback.core.status.ErrorStatus; import ch.qos.logback.core.util.OptionHelper; diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java index 90a59ab..cba9645 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DateTokenConverter.java @@ -82,8 +82,8 @@ public class DateTokenConverter<E> extends DynamicConverter<E> implements MonoTy } public String toRegex() { - DatePatternToRegexUtil toRegex = new DatePatternToRegexUtil(datePattern); - return toRegex.toRegex(); + DatePatternToRegexUtil datePatternToRegexUtil = new DatePatternToRegexUtil(datePattern); + return datePatternToRegexUtil.toRegex(); } public boolean isPrimary() { diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceToRegexMapper.java b/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceToRegexMapper.java index 961ad4f..5a43bc3 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceToRegexMapper.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceToRegexMapper.java @@ -31,7 +31,7 @@ class CharSequenceToRegexMapper { return ".*"; case 'M': if (occurrences >= 3) { - return ".\\{3,12}"; + return ".{3,12}"; } else { return number(occurrences); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/DatePatternToRegexUtil.java b/logback-core/src/main/java/ch/qos/logback/core/util/DatePatternToRegexUtil.java index ad546f7..ff001be 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/util/DatePatternToRegexUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/DatePatternToRegexUtil.java @@ -29,12 +29,12 @@ public class DatePatternToRegexUtil { final int datePatternLength; final CharSequenceToRegexMapper regexMapper = new CharSequenceToRegexMapper(); - DatePatternToRegexUtil(String datePattern) { + public DatePatternToRegexUtil(String datePattern) { this.datePattern = datePattern; datePatternLength = datePattern.length(); } - String toRegex() { + public String toRegex() { List<CharSequenceState> charSequenceList = tokenize(); StringBuilder sb = new StringBuilder(); for (CharSequenceState seq : charSequenceList) { diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/PackageTest.java index b309a9a..adb6833 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/PackageTest.java @@ -13,6 +13,7 @@ */ package ch.qos.logback.core.rolling.helper; +import ch.qos.logback.core.util.DatePatternToRegexTest; import junit.framework.TestCase; import org.junit.runner.RunWith; diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/DatePatternToRegexTest.java b/logback-core/src/test/java/ch/qos/logback/core/util/DatePatternToRegexTest.java similarity index 85% rename from logback-core/src/test/java/ch/qos/logback/core/rolling/helper/DatePatternToRegexTest.java rename to logback-core/src/test/java/ch/qos/logback/core/util/DatePatternToRegexTest.java index 9b255ea..8281b8f 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/DatePatternToRegexTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/util/DatePatternToRegexTest.java @@ -11,7 +11,7 @@ * under the terms of the GNU Lesser General Public License version 2.1 * as published by the Free Software Foundation. */ -package ch.qos.logback.core.rolling.helper; +package ch.qos.logback.core.util; import static org.junit.Assert.assertTrue; @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import ch.qos.logback.core.rolling.helper.DateTokenConverter; import org.junit.BeforeClass; import org.junit.Test; @@ -28,19 +29,26 @@ import ch.qos.logback.core.CoreConstants; public class DatePatternToRegexTest { static Calendar CAL_2009_08_3_NIGHT = Calendar.getInstance(); static Calendar CAL_2009_08_3_MORNING = Calendar.getInstance(); - + @BeforeClass public static void setUpCalendars() { CAL_2009_08_3_NIGHT.set(2009, 8, 3, 21, 57, 16); CAL_2009_08_3_NIGHT.set(Calendar.MILLISECOND, 333); - + CAL_2009_08_3_MORNING.set(2009, 8, 3, 10, 24, 37); CAL_2009_08_3_MORNING.set(Calendar.MILLISECOND, 333); } - + @Test public void ISO8601() { - doTest(CoreConstants.ISO8601_PATTERN, CAL_2009_08_3_NIGHT);; + doTest(CoreConstants.ISO8601_PATTERN, CAL_2009_08_3_NIGHT); + ; + } + + @Test + public void withQuotes() { + doTest("yyyy-MM-dd'T'HH:mm:ss,SSS", CAL_2009_08_3_NIGHT); + ; } @Test @@ -49,19 +57,18 @@ public class DatePatternToRegexTest { doTest("yyyy-MMMM-dd", CAL_2009_08_3_NIGHT); } - @Test public void dot() { - doTest("yyyy.MMM.dd", CAL_2009_08_3_NIGHT);; + doTest("yyyy.MMM.dd", CAL_2009_08_3_NIGHT); + ; } - + @Test public void timeZone() { doTest("yyyy-MMM-dd HH:mm:ss z", CAL_2009_08_3_NIGHT); doTest("yyyy-MMM-dd HH:mm:ss Z", CAL_2009_08_3_NIGHT); } - @Test public void dayInWeek() { doTest("yyyy-MMM-E", CAL_2009_08_3_NIGHT); @@ -72,7 +79,7 @@ public class DatePatternToRegexTest { @Test public void amPm() { doTest("yyyy-MM-dd a", CAL_2009_08_3_NIGHT); - doTest("yyyy-MM-dd a", CAL_2009_08_3_MORNING); + doTest("yyyy-MM-dd a", CAL_2009_08_3_MORNING); } @@ -81,22 +88,22 @@ public class DatePatternToRegexTest { DateTokenConverter dtc = makeDTC(datePattern); verify(sdf, calendar, dtc, slashified); } - + void doTest(String datePattern, Calendar calendar) { doTest(datePattern, calendar, false); } - - - void verify(SimpleDateFormat sdf, Calendar calendar, DateTokenConverter dtc, boolean slashified) { + + + void verify(SimpleDateFormat sdf, Calendar calendar, DateTokenConverter dtc, boolean slashified) { String expected = sdf.format(calendar.getTime()); - if(slashified) { + if (slashified) { expected = expected.replace('\\', '/'); } String regex = dtc.toRegex(); //System.out.println("expected="+expected); //System.out.println(regex); assertTrue("[" + expected + "] does not match regex [" + regex + "]", - expected.matches(regex)); + expected.matches(regex)); } private DateTokenConverter makeDTC(String datePattern) { diff --git a/logback-examples/src/main/java/chapters/mdc/SimpleMDC.java b/logback-examples/src/main/java/chapters/mdc/SimpleMDC.java index 7598b80..48fdae4 100644 --- a/logback-examples/src/main/java/chapters/mdc/SimpleMDC.java +++ b/logback-examples/src/main/java/chapters/mdc/SimpleMDC.java @@ -83,7 +83,7 @@ public class SimpleMDC { try { JoranConfigurator configurator = new JoranConfigurator(); configurator.setContext(lc); - lc.stop(); + lc.reset(); URL url = Loader.getResourceBySelfClassLoader("chapters/mdc/simpleMDC.xml"); configurator.doConfigure(url); } catch (JoranException je) { diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html index dd20da2..c3cfa3d 100644 --- a/logback-site/src/site/pages/manual/layouts.html +++ b/logback-site/src/site/pages/manual/layouts.html @@ -774,14 +774,14 @@ Caller+2 at mainPackage.ConfigTester.main(ConfigTester.java:38)</pre> <td> - Outputs the MDC (mapped diagnostic - context) associated with the thread that - generated the logging event. + Outputs the MDC (mapped diagnostic context) associated + with the thread that generated the logging event. If the mdc conversion word is followed by a key - between braces, as in %mdc{clientNumber}, then the - value in the MDC corresponding to the key will be output. + between braces, as in %mdc{userid}, then the MDC + value corresponding to the key 'userid' will be output. If + the that value is null, the empty string is output. If no option is given, then the entire content of the MDC @@ -789,7 +789,7 @@ Caller+2 at mainPackage.ConfigTester.main(ConfigTester.java:38)</pre> See the <a href="mdc.html">chapter on MDC</a> for more - details. + details on the subject. </td> ----------------------------------------------------------------------- Summary of changes: .../qos/logback/classic/pattern/MDCConverter.java | 43 +++++++++++-------- .../ch/qos/logback/core/pattern/Converter.java | 2 +- .../qos/logback/core/pattern/parser/Compiler.java | 5 ++- .../core/rolling/helper/DateTokenConverter.java | 4 +- .../core/util/CharSequenceToRegexMapper.java | 2 +- .../logback/core/util/DatePatternToRegexUtil.java | 4 +- .../logback/core/rolling/helper/PackageTest.java | 1 + .../helper => util}/DatePatternToRegexTest.java | 39 ++++++++++------- .../src/main/java/chapters/mdc/SimpleMDC.java | 2 +- logback-site/src/site/pages/manual/layouts.html | 12 +++--- 10 files changed, 66 insertions(+), 48 deletions(-) rename logback-core/src/test/java/ch/qos/logback/core/{rolling/helper => util}/DatePatternToRegexTest.java (85%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0