February 2010 - logback-dev

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-22-g1833957
by git-noreply＠pixie.qos.ch 11 Feb '10

11 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 183395777e6e189e69198f24567d7d214d163f4e (commit) from 912a925ea5d92c45a8b6bafe7f2691fb9be155d7 (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=183395777e6e189e69198f24… http://github.com/ceki/logback/commit/183395777e6e189e69198f24567d7d214d163… commit 183395777e6e189e69198f24567d7d214d163f4e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Feb 11 20:24:57 2010 +0100 - increase induced delay so that MultiThreadedRollingTest.multiThreadedSizeBased test passes on a fast machine diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java index bac049b..4e33647 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java @@ -279,7 +279,7 @@ public class MultiThreadedRollingTest { while (!isDone()) { counter++; rfa.doAppend(id + " " + counter); - if ((counter % 100 == 0) && withInducedDelay) { + if ((counter % 64 == 0) && withInducedDelay) { try { Thread.sleep(10); } catch (InterruptedException e) { ----------------------------------------------------------------------- Summary of changes: .../core/rolling/MultiThreadedRollingTest.java | 2 +- 1 files changed, 1 insertions(+), 1 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. v0.9.18-21-g912a925
by git-noreply＠pixie.qos.ch 11 Feb '10

11 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 912a925ea5d92c45a8b6bafe7f2691fb9be155d7 (commit) from aae40ddb853fa6535d0bf181d9b61435e8c1f984 (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=912a925ea5d92c45a8b6bafe… http://github.com/ceki/logback/commit/912a925ea5d92c45a8b6bafe7f2691fb9be15… commit 912a925ea5d92c45a8b6bafe7f2691fb9be155d7 Author: Ceki Gulcu <ceki(a)gimmel.(none)> Date: Thu Feb 11 19:48:18 2010 +0100 - have MultiThreadedRollingTest run consistently on a fast linux machine diff --git a/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java b/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java index 6c9b56e..f3f28b6 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/db/DBAppenderIntegrationTest.java @@ -15,7 +15,6 @@ package ch.qos.logback.access.db; import static org.junit.Assert.assertEquals; -import java.net.InetAddress; import java.util.Random; import org.junit.After; @@ -37,7 +36,7 @@ import ch.qos.logback.core.util.StatusPrinter; public class DBAppenderIntegrationTest { - static String LOCAL_HOST_NAME; + static String LOCAL_HOST_NAME = Env.getLocalHostName(); static String[] CONFORMING_HOST_LIST = new String[] { "Orion" }; int diff = new Random(System.nanoTime()).nextInt(10000); @@ -45,8 +44,6 @@ public class DBAppenderIntegrationTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - InetAddress localhostIA = InetAddress.getLocalHost(); - LOCAL_HOST_NAME = localhostIA.getHostName(); } @AfterClass @@ -85,12 +82,7 @@ public class DBAppenderIntegrationTest { if(!Env.isJDK6OrHigher()) { return false; } - for (String conformingHost : CONFORMING_HOST_LIST) { - if (conformingHost.equalsIgnoreCase(LOCAL_HOST_NAME)) { - return true; - } - } - return false; + return Env.isLocalHostNameInList(CONFORMING_HOST_LIST); } @Test diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java index e6ecc44..bac049b 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java @@ -26,7 +26,6 @@ import java.io.OutputStream; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import ch.qos.logback.core.Context; @@ -36,6 +35,7 @@ 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.Env; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; @@ -50,13 +50,14 @@ public class MultiThreadedRollingTest { Context context = new ContextBase(); static String VERIFY_SH = "verify.sh"; - + int diff = RandomUtil.getPositiveInt(); String outputDirStr = CoreTestConstants.OUTPUT_DIR_PREFIX + "multi-" + diff + "/"; RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); + String pathToBash = Env.getPathToBash(); OutputStream scriptOS; @Before @@ -65,8 +66,8 @@ public class MultiThreadedRollingTest { File outputDir = new File(outputDirStr); outputDir.mkdirs(); - System.out.println("Output dir ["+outputDirStr+"]"); - + System.out.println("Output dir [" + outputDirStr + "]"); + scriptOS = openScript(); rfa.setName("rolling"); @@ -113,7 +114,7 @@ public class MultiThreadedRollingTest { FixedWindowRollingPolicy fwrp = new FixedWindowRollingPolicy(); fwrp.setContext(context); fwrp.setFileNamePattern(outputDirStr + "test-%i.log"); - fwrp.setMaxIndex(10); + fwrp.setMaxIndex(20); fwrp.setMinIndex(0); fwrp.setParent(rfa); fwrp.start(); @@ -121,24 +122,24 @@ public class MultiThreadedRollingTest { rfa.start(); } - RunnableWithCounterAndDone[] buildRunnableArray() { + RunnableWithCounterAndDone[] buildRunnableArray(boolean withDelay) { RunnableWithCounterAndDone[] runnableArray = new RunnableWithCounterAndDone[NUM_THREADS]; for (int i = 0; i < NUM_THREADS; i++) { - runnableArray[i] = new RFARunnable(i, rfa); + runnableArray[i] = new RFARunnable(i, rfa, withDelay); } return runnableArray; } OutputStream openScript() throws IOException { - FileOutputStream fos = new FileOutputStream(outputDirStr +VERIFY_SH); + FileOutputStream fos = new FileOutputStream(outputDirStr + VERIFY_SH); return fos; } - + @Test public void multiThreadedTimedBased() throws InterruptedException, IOException { setUpTimeBasedTriggeringPolicy(rfa); - executeHarness(); + executeHarness(TOTAL_DURATION, false); printScriptForTimeBased(); verify(); } @@ -147,30 +148,40 @@ public class MultiThreadedRollingTest { File outputDir = new File(outputDirStr); FilenameFilter filter = new FilenameFilter() { public boolean accept(File dir, String name) { - if(name.matches("test-\\d{1,2}.log")) { + if (name.matches("test-\\d{1,2}.log")) { return true; - } + } return false; } }; File[] files = outputDir.listFiles(filter); return files.length; } - + void verify() throws IOException, InterruptedException { close(scriptOS); + // no point in this test if we don't have bash + if(pathToBash == null) { + return; + } ProcessBuilder pb = new ProcessBuilder(); - pb.command(CoreTestConstants.BASH_PATH, VERIFY_SH); + pb.command(pathToBash, VERIFY_SH); pb.directory(new File(outputDirStr)); Process process = pb.start(); process.waitFor(); - assertEquals(SUCCESSFUL_EXIT_CODE, process.exitValue()); + int exitCode = process.exitValue(); + + assertEquals(SUCCESSFUL_EXIT_CODE, exitCode); + System.out.println("External script based verification returned with exit code "+exitCode); } @Test public void multiThreadedSizeBased() throws InterruptedException, IOException { setUpSizeBasedTriggeringPolicy(rfa); - executeHarness(); + // on a fast machine with a fast hard disk, if the tests runs for too + // long the MAX_WINDOW_SIZE is reached, resulting in data loss which + // we cannot test for. + executeHarness(TOTAL_DURATION, true); int numFiles = testFileCount(); printScriptForSizeBased(numFiles); verify(); @@ -195,11 +206,11 @@ public class MultiThreadedRollingTest { out(" res=$?"); out(" if [ $res != \"0\" ]; then"); out(" echo \"FAILED for $t\""); - out(" exit "+FAILURE_EXIT_CODE); + out(" exit " + FAILURE_EXIT_CODE); out(" fi"); out("done"); out(""); - out("exit "+SUCCESSFUL_EXIT_CODE); + out("exit " + SUCCESSFUL_EXIT_CODE); } private void printScriptForTimeBased() throws IOException { @@ -222,7 +233,8 @@ public class MultiThreadedRollingTest { } out(""); out("rm aggregated"); - out("for i in $(seq " + numfiles+" -1 0); do cat test-$i.log >> aggregated; done"); + out("for i in $(seq " + (numfiles - 1) + + " -1 0); do cat test-$i.log >> aggregated; done"); out("cat output.log >> aggregated"); out(""); printCommonScriptCore(); @@ -233,10 +245,11 @@ public class MultiThreadedRollingTest { scriptOS.write("\n".getBytes()); } - private void executeHarness() throws InterruptedException { + private void executeHarness(int duration, boolean withDelay) + throws InterruptedException { MultiThreadedHarness multiThreadedHarness = new MultiThreadedHarness( - TOTAL_DURATION); - this.runnableArray = buildRunnableArray(); + duration); + this.runnableArray = buildRunnableArray(withDelay); multiThreadedHarness.execute(runnableArray); StatusChecker checker = new StatusChecker(context.getStatusManager()); @@ -253,16 +266,25 @@ public class MultiThreadedRollingTest { static class RFARunnable extends RunnableWithCounterAndDone { RollingFileAppender<Object> rfa; int id; + boolean withInducedDelay; - RFARunnable(int id, RollingFileAppender<Object> rfa) { + RFARunnable(int id, RollingFileAppender<Object> rfa, + boolean withInducedDelay) { this.id = id; this.rfa = rfa; + this.withInducedDelay = withInducedDelay; } public void run() { while (!isDone()) { counter++; rfa.doAppend(id + " " + counter); + if ((counter % 100 == 0) && withInducedDelay) { + try { + Thread.sleep(10); + } catch (InterruptedException e) { + } + } } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/testUtil/Env.java b/logback-core/src/test/java/ch/qos/logback/core/testUtil/Env.java index bc7f55e..e645064 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/testUtil/Env.java +++ b/logback-core/src/test/java/ch/qos/logback/core/testUtil/Env.java @@ -13,6 +13,11 @@ */ package ch.qos.logback.core.testUtil; +import java.net.InetAddress; +import java.net.UnknownHostException; + +import ch.qos.logback.core.util.CoreTestConstants; + public class Env { static public boolean isWindows() { @@ -22,7 +27,7 @@ public class Env { static public boolean isMac() { return System.getProperty("os.name").indexOf("Mac") != -1; } - + static public boolean isLinux() { return System.getProperty("os.name").indexOf("Linux") != -1; } @@ -39,4 +44,37 @@ public class Env { } } + static public String getLocalHostName() { + InetAddress localhostIA; + try { + localhostIA = InetAddress.getLocalHost(); + return localhostIA.getHostName(); + } catch (UnknownHostException e) { + return null; + } + } + + static public boolean isLocalHostNameInList(String[] hostList) { + String localHostName = getLocalHostName(); + if (localHostName == null) { + return false; + } + for (String host : hostList) { + if (host.equalsIgnoreCase(localHostName)) { + return true; + } + } + return false; + } + + + public static String getPathToBash() { + if(Env.isLinux()) { + return CoreTestConstants.BASH_PATH_ON_LINUX; + } + if(Env.isLocalHostNameInList(new String[] {"hetz"})) { + return CoreTestConstants.BASH_PATH_ON_CYGWIN; + } + return null; + } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java b/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java index 55f0761..29c180c 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java +++ b/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java @@ -23,5 +23,6 @@ public class CoreTestConstants { public static final int SUCCESSFUL_EXIT_CODE = 8; public static final int FAILURE_EXIT_CODE = 1; - public static final String BASH_PATH = "c:/cygwin/bin/bash"; + public static final String BASH_PATH_ON_CYGWIN = "c:/cygwin/bin/bash"; + public static final String BASH_PATH_ON_LINUX = "bash"; } ----------------------------------------------------------------------- Summary of changes: .../access/db/DBAppenderIntegrationTest.java | 12 +--- .../core/rolling/MultiThreadedRollingTest.java | 68 +++++++++++++------- .../java/ch/qos/logback/core/testUtil/Env.java | 40 +++++++++++- .../qos/logback/core/util/CoreTestConstants.java | 3 +- 4 files changed, 88 insertions(+), 35 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-20-gaae40dd
by git-noreply＠pixie.qos.ch 11 Feb '10

11 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via aae40ddb853fa6535d0bf181d9b61435e8c1f984 (commit) from defa388aea50810872efdfe85baad9d4ff67c49f (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=aae40ddb853fa6535d0bf181… http://github.com/ceki/logback/commit/aae40ddb853fa6535d0bf181d9b61435e8c1f… commit aae40ddb853fa6535d0bf181d9b61435e8c1f984 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Feb 11 17:48:08 2010 +0100 - an attempt to make MultiThreadedRollingTest to run without any human intervention diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java index c1b21e2..e6ecc44 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/MultiThreadedRollingTest.java @@ -13,12 +13,20 @@ */ package ch.qos.logback.core.rolling; +import static ch.qos.logback.core.util.CoreTestConstants.FAILURE_EXIT_CODE; +import static ch.qos.logback.core.util.CoreTestConstants.SUCCESSFUL_EXIT_CODE; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.io.File; +import java.io.FileOutputStream; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.OutputStream; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import ch.qos.logback.core.Context; @@ -41,18 +49,26 @@ public class MultiThreadedRollingTest { Layout<Object> layout; Context context = new ContextBase(); + static String VERIFY_SH = "verify.sh"; + int diff = RandomUtil.getPositiveInt(); String outputDirStr = CoreTestConstants.OUTPUT_DIR_PREFIX + "multi-" + diff + "/"; RollingFileAppender<Object> rfa = new RollingFileAppender<Object>(); + OutputStream scriptOS; + @Before public void setUp() throws Exception { layout = new EchoLayout<Object>(); File outputDir = new File(outputDirStr); outputDir.mkdirs(); + System.out.println("Output dir ["+outputDirStr+"]"); + + scriptOS = openScript(); + rfa.setName("rolling"); rfa.setLayout(layout); rfa.setContext(context); @@ -60,12 +76,21 @@ public class MultiThreadedRollingTest { } + void close(OutputStream os) { + if (os != null) { + try { + os.close(); + } catch (IOException e) { + } + } + } + @After public void tearDown() throws Exception { rfa.stop(); } - public void setUpTImeBasedTriggeringPolicy(RollingFileAppender<Object> rfa) { + public void setUpTimeBasedTriggeringPolicy(RollingFileAppender<Object> rfa) { String datePattern = "yyyy-MM-dd'T'HH_mm_ss_SSS"; TimeBasedRollingPolicy tbrp = new TimeBasedRollingPolicy(); tbrp.setFileNamePattern(outputDirStr + "test-%d{" + datePattern + "}"); @@ -104,31 +129,62 @@ public class MultiThreadedRollingTest { return runnableArray; } + OutputStream openScript() throws IOException { + FileOutputStream fos = new FileOutputStream(outputDirStr +VERIFY_SH); + return fos; + } + @Test - public void multiThreadedTimedBased() throws InterruptedException { - setUpTImeBasedTriggeringPolicy(rfa); + public void multiThreadedTimedBased() throws InterruptedException, + IOException { + setUpTimeBasedTriggeringPolicy(rfa); executeHarness(); printScriptForTimeBased(); + verify(); + } + + int testFileCount() { + File outputDir = new File(outputDirStr); + FilenameFilter filter = new FilenameFilter() { + public boolean accept(File dir, String name) { + if(name.matches("test-\\d{1,2}.log")) { + return true; + } + return false; + } + }; + File[] files = outputDir.listFiles(filter); + return files.length; + } + + void verify() throws IOException, InterruptedException { + close(scriptOS); + ProcessBuilder pb = new ProcessBuilder(); + pb.command(CoreTestConstants.BASH_PATH, VERIFY_SH); + pb.directory(new File(outputDirStr)); + Process process = pb.start(); + process.waitFor(); + assertEquals(SUCCESSFUL_EXIT_CODE, process.exitValue()); } @Test - public void multiThreadedSizeBased() throws InterruptedException { + public void multiThreadedSizeBased() throws InterruptedException, IOException { setUpSizeBasedTriggeringPolicy(rfa); executeHarness(); - printScriptForSizeBased(); + int numFiles = testFileCount(); + printScriptForSizeBased(numFiles); + verify(); } - private void printScriptHeader(String type) { + private void printScriptHeader(String type) throws IOException { out("# ===================================================="); - out("# Adapt this scipt to check the exactness of the output "); - out("# produced by "+type+" test"); + out("# A script to check the exactness of the output "); + out("# produced by " + type + " test"); out("# ===================================================="); out("# "); - out("# cd to "+outputDirStr); - } - private void printCommonScriptCore() { + private void printCommonScriptCore() throws IOException { out(""); out("for t in $(seq 0 1 " + (NUM_THREADS - 1) + ")"); out("do"); @@ -139,14 +195,14 @@ public class MultiThreadedRollingTest { out(" res=$?"); out(" if [ $res != \"0\" ]; then"); out(" echo \"FAILED for $t\""); - out(" exit 1"); + out(" exit "+FAILURE_EXIT_CODE); out(" fi"); out("done"); out(""); - out("echo SUCCESS"); + out("exit "+SUCCESSFUL_EXIT_CODE); } - private void printScriptForTimeBased() { + private void printScriptForTimeBased() throws IOException { printScriptHeader("TimeBased"); for (int i = 0; i < NUM_THREADS; i++) { out("end[" + i + "]=" + this.runnableArray[i].getCounter()); @@ -158,23 +214,23 @@ public class MultiThreadedRollingTest { } - private void printScriptForSizeBased() { + private void printScriptForSizeBased(int numfiles) throws IOException { printScriptHeader("SizeBased"); - + for (int i = 0; i < NUM_THREADS; i++) { out("end[" + i + "]=" + this.runnableArray[i].getCounter()); } out(""); out("rm aggregated"); - out("Modify the integer set to include all test-* files"); - out("for i in 3 2 1 0; do cat test-$i.log >> aggregated; done"); + out("for i in $(seq " + numfiles+" -1 0); do cat test-$i.log >> aggregated; done"); out("cat output.log >> aggregated"); out(""); printCommonScriptCore(); } - - private void out(String msg) { - System.out.println(msg); + + private void out(String msg) throws IOException { + scriptOS.write(msg.getBytes()); + scriptOS.write("\n".getBytes()); } private void executeHarness() throws InterruptedException { diff --git a/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java b/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java index e86a014..55f0761 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java +++ b/logback-core/src/test/java/ch/qos/logback/core/util/CoreTestConstants.java @@ -19,4 +19,9 @@ public class CoreTestConstants { public static final String TEST_DIR_PREFIX = "src/test/"; public static final String OUTPUT_DIR_PREFIX = "target/test-output/"; + + public static final int SUCCESSFUL_EXIT_CODE = 8; + public static final int FAILURE_EXIT_CODE = 1; + + public static final String BASH_PATH = "c:/cygwin/bin/bash"; } ----------------------------------------------------------------------- Summary of changes: .../core/rolling/MultiThreadedRollingTest.java | 98 +++++++++++++++---- .../qos/logback/core/util/CoreTestConstants.java | 5 + 2 files changed, 82 insertions(+), 21 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. v0.9.18-19-gdefa388
by git-noreply＠pixie.qos.ch 11 Feb '10

11 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via defa388aea50810872efdfe85baad9d4ff67c49f (commit) from 4e5aba2f2489bd7d2a1f8284202a8cf7d3373a22 (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=defa388aea50810872efdfe8… http://github.com/ceki/logback/commit/defa388aea50810872efdfe85baad9d4ff67c… commit defa388aea50810872efdfe85baad9d4ff67c49f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Feb 11 14:41:58 2010 +0100 - renaming test file diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/event/SaxEventRecorderTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/event/SaxEventRecorderTest.java new file mode 100644 index 0000000..a820f19 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/event/SaxEventRecorderTest.java @@ -0,0 +1,110 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * 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. + */ +package ch.qos.logback.core.joran.event; + +import static org.junit.Assert.*; + +import java.io.FileInputStream; +import java.util.List; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.junit.Test; +import org.xml.sax.Attributes; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.util.CoreTestConstants; + +/** + * Test whether SaxEventRecorder does a good job. + * + * @author Ceki Gulcu + */ +public class SaxEventRecorderTest { + + Context context = new ContextBase(); + + + SAXParser createParser() throws Exception { + SAXParserFactory spf = SAXParserFactory.newInstance(); + return spf.newSAXParser(); + } + + public List<SaxEvent> doTest(String filename) throws Exception { + SaxEventRecorder recorder = new SaxEventRecorder(); + recorder.setContext(context); + FileInputStream fis = new FileInputStream(CoreTestConstants.TEST_DIR_PREFIX + + "input/joran/"+ filename); + recorder.recordEvents(fis); + return recorder.getSaxEventList(); + + + } + + public void dump(List<SaxEvent> seList) { + for (SaxEvent se : seList) { + System.out.println(se); + } + } + + @Test + public void test1() throws Exception { + List<SaxEvent> seList = doTest("event1.xml"); + StatusManager sm = context.getStatusManager(); + assertTrue(sm.getLevel() == Status.INFO); + //dump(seList); + assertEquals(11, seList.size()); + } + + @Test + public void test2() throws Exception { + List<SaxEvent> seList = doTest("ampEvent.xml"); + StatusManager sm = context.getStatusManager(); + assertTrue(sm.getLevel() == Status.INFO); + //dump(seList); + assertEquals(3, seList.size()); + + BodyEvent be = (BodyEvent) seList.get(1); + assertEquals("xxx & yyy", be.getText()); + } + + @Test + public void test3() throws Exception { + List<SaxEvent> seList = doTest("inc.xml"); + StatusManager sm = context.getStatusManager(); + assertTrue(sm.getLevel() == Status.INFO); + //dump(seList); + assertEquals(4, seList.size()); + + StartEvent se = (StartEvent) seList.get(1); + Attributes attr = se.getAttributes(); + assertNotNull(attr); + assertEquals("1", attr.getValue("increment")); + } + + @Test + public void bodyWithSpacesAndQuotes() throws Exception { + List<SaxEvent> seList = doTest("spacesAndQuotes.xml"); + assertEquals(3, seList.size()); + BodyEvent be = (BodyEvent) seList.get(1); + assertEquals("[x][x] \"xyz\"%n", be.getText()); + } + + + +} ----------------------------------------------------------------------- Summary of changes: .../core/joran/event/SaxEventRecorderTest.java | 110 ++++++++++++++++++++ 1 files changed, 110 insertions(+), 0 deletions(-) create mode 100644 logback-core/src/test/java/ch/qos/logback/core/joran/event/SaxEventRecorderTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-134) Joran XML Parser sometimes misses white space characters from element bodies
by Michael Franz (JIRA) 10 Feb '10

10 Feb '10

Joran XML Parser sometimes misses white space characters from element bodies ---------------------------------------------------------------------------- Key: LBCORE-134 URL: http://jira.qos.ch/browse/LBCORE-134 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.18 Reporter: Michael Franz Assignee: Logback dev list Priority: Critical I have the following example configuration: <property name="Layout1" value="[Layout1] "xyz""/> <appender name="LayoutTest_Console" class="ch.qos.logback.core.ConsoleAppender"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <level>TRACE</level> </filter> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern> [%date{yyyy-MM-dd HH:mm:ss.SSS}] ${Layout1} [Layout2] "xyz"%n </Pattern> </layout> </appender> and this produces the following output: [2010-01-05 13:06:34.897] [Layout1] "xyz" [Layout2]"xyz" Notice the missing space between [Layout2] and "xyz" in the output that was present in the configuration. The investigation shows a bug in ch.qos.logback.core.joran.event.SaxEventRecorder: public void characters(char[] ch, int start, int length) { String body = new String(ch, start, length); if (body == null) { return; } // if the body string is null if (body != null) { String bodyTrimmed = body.trim(); if (bodyTrimmed.length() == 0) { return; } } SaxEvent lastEvent = getLastEvent(); if (lastEvent instanceof BodyEvent) { BodyEvent be = (BodyEvent) lastEvent; be.append(body); } else { saxEventList.add(new BodyEvent(body, getLocator())); } } In my case the following calls were made to this method: 1. "[%date{yyyy-MM-dd HH:mm:ss.SSS}] ${Layout1} [Layout2]" 2. " " 3. """ 4. "xyz" 5. """ 6. "%n". Note that the calls actually performed depend on the actual body content within the file and the actually used SAX parser (in my case com.sun.org.apache.xerces.internal.jaxp.SAXParserImpl$JAXPSAXParser). So within the method the: // if the body string is null if (body != null) { String bodyTrimmed = body.trim(); if (bodyTrimmed.length() == 0) { return; } } must not occur if the last event was already a BodyEvent. -- 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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-18-g4e5aba2
by git-noreply＠pixie.qos.ch 10 Feb '10

10 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 4e5aba2f2489bd7d2a1f8284202a8cf7d3373a22 (commit) from 3884318ebb54e4020756c0ae289d12f02a2f7aec (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=4e5aba2f2489bd7d2a1f8284… http://github.com/ceki/logback/commit/4e5aba2f2489bd7d2a1f8284202a8cf7d3373… commit 4e5aba2f2489bd7d2a1f8284202a8cf7d3373a22 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Feb 10 23:22:27 2010 +0100 Fixed LBCORE-134 reported by Michael Franz. While reading configuration files (in XML), the event handler will correctly process body text, in particular spaces, even when delivered in multiple chunks. The previous behavior of trimming leading and trailing white space has been preserved. Moreover, body text consisting of white space surrounding child elements is ignored. diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/event/BodyEvent.java b/logback-core/src/main/java/ch/qos/logback/core/joran/event/BodyEvent.java index 1ab4f17..5cf61e6 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/event/BodyEvent.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/event/BodyEvent.java @@ -25,7 +25,15 @@ public class BodyEvent extends SaxEvent { this.text = text; } + /** + * Always trim trailing spaces from the body text. + * + * @return + */ public String getText() { + if(text != null) { + return text.trim(); + } return text; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java b/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java index 9afddd0..b8760c0 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/event/SaxEventRecorder.java @@ -37,17 +37,16 @@ import ch.qos.logback.core.status.Status; public class SaxEventRecorder extends DefaultHandler implements ContextAware { - final ContextAwareImpl cai; - + public SaxEventRecorder() { - cai = new ContextAwareImpl(this); + cai = new ContextAwareImpl(this); } + public List<SaxEvent> saxEventList = new ArrayList<SaxEvent>(); Locator locator; Pattern globalPattern = new Pattern(); - final public void recordEvents(InputStream inputStream) throws JoranException { recordEvents(new InputSource(inputStream)); } @@ -104,28 +103,22 @@ public class SaxEventRecorder extends DefaultHandler implements ContextAware { } public void characters(char[] ch, int start, int length) { - - String body = new String(ch, start, length); - if (body == null) { - return; - } - - // if the body string is null - if (body != null) { - String bodyTrimmed = body.trim(); - if (bodyTrimmed.length() == 0) { - return; - } - } - + String bodyStr = new String(ch, start, length); SaxEvent lastEvent = getLastEvent(); if (lastEvent instanceof BodyEvent) { BodyEvent be = (BodyEvent) lastEvent; - be.append(body); + be.append(bodyStr); } else { - saxEventList.add(new BodyEvent(body, getLocator())); + // ignore space only text if the previous event is not a BodyEvent + if (!isSpaceOnly(bodyStr)) { + saxEventList.add(new BodyEvent(bodyStr, getLocator())); + } } + } + boolean isSpaceOnly(String bodyStr) { + String bodyTrimmed = bodyStr.trim(); + return (bodyTrimmed.length() == 0); } SaxEvent getLastEvent() { @@ -156,8 +149,8 @@ public class SaxEventRecorder extends DefaultHandler implements ContextAware { } public void fatalError(SAXParseException spe) throws SAXException { - addError("Parsing fatal error on line " + spe.getLineNumber() + " and column " - + spe.getColumnNumber(), spe); + addError("Parsing fatal error on line " + spe.getLineNumber() + + " and column " + spe.getColumnNumber(), spe); } public void warning(SAXParseException spe) throws SAXException { diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java index 757a43b..5f47444 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/RollingPolicyBase.java @@ -55,7 +55,6 @@ public abstract class RollingPolicyBase extends ContextAwareBase implements } } - public void setFileNamePattern(String fnp) { fileNamePatternStr = fnp; } diff --git a/logback-core/src/test/input/joran/spacesAndQuotes.xml b/logback-core/src/test/input/joran/spacesAndQuotes.xml new file mode 100644 index 0000000..771a9a9 --- /dev/null +++ b/logback-core/src/test/input/joran/spacesAndQuotes.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + +<x>[x][x] "xyz"%n</x> diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java deleted file mode 100644 index a45d2f2..0000000 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2009, QOS.ch. All rights reserved. - * - * This program and the accompanying materials are dual-licensed under - * either the terms of the Eclipse Public License v1.0 as published by - * the Eclipse Foundation - * - * 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. - */ -package ch.qos.logback.core.joran.event; - -import static org.junit.Assert.*; - -import java.io.FileInputStream; -import java.util.List; - -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; - -import org.junit.Test; -import org.xml.sax.Attributes; - -import ch.qos.logback.core.Context; -import ch.qos.logback.core.ContextBase; -import ch.qos.logback.core.status.Status; -import ch.qos.logback.core.status.StatusManager; -import ch.qos.logback.core.util.CoreTestConstants; - -/** - * Test whether SaxEventRecorder does a good job. - * - * @author Ceki Gulcu - */ -public class EventRecorderTest { - - Context context = new ContextBase(); - - - SAXParser createParser() throws Exception { - SAXParserFactory spf = SAXParserFactory.newInstance(); - return spf.newSAXParser(); - } - - public List<SaxEvent> doTest(String filename) throws Exception { - SaxEventRecorder recorder = new SaxEventRecorder(); - recorder.setContext(context); - FileInputStream fis = new FileInputStream(CoreTestConstants.TEST_DIR_PREFIX - + "input/joran/"+ filename); - recorder.recordEvents(fis); - return recorder.getSaxEventList(); - - - } - - public void dump(List<SaxEvent> seList) { - for (SaxEvent se : seList) { - System.out.println(se); - } - } - /** - * Tests that whenever an action throws an exception, processing of child - * elements is skipped. - * - * @throws Exception - */ - @Test - public void test1() throws Exception { - List<SaxEvent> seList = doTest("event1.xml"); - StatusManager sm = context.getStatusManager(); - assertTrue(sm.getLevel() == Status.INFO); - //dump(seList); - assertEquals(11, seList.size()); - - } - - @Test - public void test2() throws Exception { - List<SaxEvent> seList = doTest("ampEvent.xml"); - StatusManager sm = context.getStatusManager(); - assertTrue(sm.getLevel() == Status.INFO); - //dump(seList); - assertEquals(3, seList.size()); - - BodyEvent be = (BodyEvent) seList.get(1); - assertEquals("xxx & yyy", be.getText()); - } - - @Test - public void test3() throws Exception { - List<SaxEvent> seList = doTest("inc.xml"); - StatusManager sm = context.getStatusManager(); - assertTrue(sm.getLevel() == Status.INFO); - //dump(seList); - assertEquals(4, seList.size()); - - StartEvent se = (StartEvent) seList.get(1); - Attributes attr = se.getAttributes(); - assertNotNull(attr); - assertEquals("1", attr.getValue("increment")); - } - -} diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/event/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/event/PackageTest.java index 260c5c4..0771ded 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/event/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/event/PackageTest.java @@ -18,6 +18,6 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -(a)SuiteClasses({EventRecorderTest.class, InPlayFireTest.class}) +(a)SuiteClasses({SaxEventRecorderTest.class, InPlayFireTest.class}) public class PackageTest { } diff --git a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java index befeef3..8bed2f4 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/pattern/parser/SamplePatternLayoutTest.java @@ -49,8 +49,6 @@ public class SamplePatternLayoutTest extends AbstractPatternLayoutBaseTest { assertEquals("x123", s); } - - @Test public void testEscapeClosingParentheses() { PatternLayoutBase<Object> plb = getPatternLayoutBase(); diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 4e27d5b..ef6b2c2 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -42,6 +42,18 @@ prevents compatibility issues, in particular with recent versions of Tomcat whcih store request header names in lower-case.</p> + + <p>Fixed <a + href="http://jira.qos.ch/browse/LBCORE-134">LBCORE-134</a> + reported by Michael Franz. While reading configuration files (in + XML), the event handler will correctly process body text, in + particular spaces, even when delivered in multiple chunks. The + previous behavior of trimming leading and trailing white space has + been preserved. Moreover, body text consisting of white space + surrounding child elements is ignored. + </p> + + <p>Fixed <a href="http://jira.qos.ch/browse/LBCORE-130">LBCORE-130</a>. <code>FileNamePattern</code> no longer treats parenthesis as special. ----------------------------------------------------------------------- Summary of changes: .../ch/qos/logback/core/joran/event/BodyEvent.java | 8 ++ .../logback/core/joran/event/SaxEventRecorder.java | 37 +++---- .../logback/core/rolling/RollingPolicyBase.java | 1 - .../src/test/input/joran/spacesAndQuotes.xml | 6 + .../core/joran/event/EventRecorderTest.java | 106 -------------------- .../qos/logback/core/joran/event/PackageTest.java | 2 +- .../pattern/parser/SamplePatternLayoutTest.java | 2 - logback-site/src/site/pages/news.html | 12 ++ 8 files changed, 42 insertions(+), 132 deletions(-) create mode 100644 logback-core/src/test/input/joran/spacesAndQuotes.xml delete mode 100644 logback-core/src/test/java/ch/qos/logback/core/joran/event/EventRecorderTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-130) Can't use path with parenthesis for logging
by Matthias (JIRA) 10 Feb '10

10 Feb '10

Can't use path with parenthesis for logging ------------------------------------------- Key: LBCORE-130 URL: http://jira.qos.ch/browse/LBCORE-130 Project: logback-core Issue Type: Bug Components: Pattern Affects Versions: 0.9.16 Reporter: Matthias Assignee: Logback dev list Priority: Minor I configured following appender: <appender name="WS_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender"> <Encoding>UTF-8</Encoding> <File>${catalina.home}/logs/webserver.log</File> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> <FileNamePattern>${catalina.home}/logs/webserver.%d{yyyy-MM-dd}.log</FileNamePattern> <MaxHistory>14</MaxHistory> </rollingPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> <PresentationHeader>ARCHIKART Webserver Logs</PresentationHeader> <Pattern>%date{dd.MM HH:mm:ss} %-20.20(%level [%thread]) - %msg%n</Pattern> </layout> </appender> In this case ${catalina.home} is "C:\Program Files (x86)\webserver". When the logback.xml is parsed the path "C:\\Program Files (x86)\\webserver\\/logs/webserver.%d{yyyy-MM-dd}.log" is only parsed to "C:\\Program Files (x86". That's why it causes an exception "FileNamePattern ... does not contain a valid DateToken" in TimeBasedRollingPolicy. When I use a path without parenthesis logging works fine. But this is the default program files directory on windows vista 64bit. I did not test 0.9.18, because I thought it would be a bigger work to change the logging of the server. I did not read anything of this in the Jira, so I think this error might still exist. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 3

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.18-17-g3884318
by git-noreply＠pixie.qos.ch 10 Feb '10

10 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 3884318ebb54e4020756c0ae289d12f02a2f7aec (commit) from 7cc45624e0baed34f3750e7a8175a83b1da4c9cf (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=3884318ebb54e4020756c0ae… http://github.com/ceki/logback/commit/3884318ebb54e4020756c0ae289d12f02a2f7… commit 3884318ebb54e4020756c0ae289d12f02a2f7aec Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Feb 10 19:21:05 2010 +0100 Fixed LBCORE-130. FileNamePattern no longer treats parenthesis as special. diff --git a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java index a57425f..74cfd1b 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java +++ b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java @@ -71,6 +71,8 @@ public class CoreConstants { public final static char PERCENT_CHAR = '%'; + public static final char LEFT_PARENTHESIS_CHAR = '('; + public static final char RIGHT_PARENTHESIS_CHAR = ')'; /** * Number of rows before in an HTML table before, @@ -110,5 +112,4 @@ public class CoreConstants { * context. */ public static final String HOSTNAME_KEY = "HOSTNAME"; - } diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java index 522964d..8e9abff 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/parser/TokenStream.java @@ -38,8 +38,6 @@ class TokenStream { private static final char ESCAPE_CHAR = '\\'; private static final char PERCENT_CHAR = CoreConstants.PERCENT_CHAR; - private static final char LEFT_PARENTHESIS = '('; - private static final char RIGHT_PARENTHESIS = ')'; private static final char CURLY_LEFT = '{'; private static final char CURLY_RIGHT = '}'; @@ -90,10 +88,10 @@ class TokenStream { state = FORMAT_MODIFIER_STATE; break; - case RIGHT_PARENTHESIS: + case CoreConstants.RIGHT_PARENTHESIS_CHAR: if (buf.length() >= 1 && buf.charAt(buf.length() - 1) == '\\') { buf.deleteCharAt(buf.length() - 1); - buf.append(RIGHT_PARENTHESIS); + buf.append(CoreConstants.RIGHT_PARENTHESIS_CHAR); } else { addValuedToken(Token.LITERAL, buf, tokenList); tokenList.add(Token.RIGHT_PARENTHESIS_TOKEN); @@ -106,7 +104,7 @@ class TokenStream { break; // case FORMAT_MODIFIER_STATE: - if (c == LEFT_PARENTHESIS) { + if (c == CoreConstants.LEFT_PARENTHESIS_CHAR) { addValuedToken(Token.FORMAT_MODIFIER, buf, tokenList); tokenList.add(Token.LEFT_PARENTHESIS_TOKEN); state = LITERAL_STATE; @@ -143,7 +141,7 @@ class TokenStream { state = FORMAT_MODIFIER_STATE; } else { addValuedToken(Token.KEYWORD, buf, tokenList); - if (c == RIGHT_PARENTHESIS) { + if (c == CoreConstants.RIGHT_PARENTHESIS_CHAR) { // if c is a right parenthesis, then add it as such tokenList.add(Token.RIGHT_PARENTHESIS_TOKEN); } else if (c == ESCAPE_CHAR) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java b/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java index 367c0c8..f9103cd 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/pattern/util/AlmostAsIsEscapeUtil.java @@ -24,14 +24,15 @@ import ch.qos.logback.core.rolling.helper.FileNamePattern; public class AlmostAsIsEscapeUtil implements IEscapeUtil { /** - * Do not perform any character escaping, except for '%'. + * Do not perform any character escaping, except for '%', and ')'. * * <p> * Here is the rationale. First, filename patterns do not include escape * combinations such as \r or \n. Moreover, characters which have special - * meaning in logback parsers, such as '(', ')', '{', or '}' cannot be part of - * file names (so me thinks). Thus, the only character that needs escaping is - * '%'. + * meaning in logback parsers, such as '{', or '}' cannot be part of file + * names (so me thinks). The left parenthesis character has special meaning + * only if it is preceded by %. Thus, the only characters that needs escaping + * are '%' and ')'. * * <p> * Note that this method assumes that it is called after the escape character @@ -40,10 +41,11 @@ public class AlmostAsIsEscapeUtil implements IEscapeUtil { public void escape(String escapeChars, StringBuffer buf, char next, int pointer) { - if (next == CoreConstants.PERCENT_CHAR) { - buf.append(CoreConstants.PERCENT_CHAR); + if (next == CoreConstants.PERCENT_CHAR + || next == CoreConstants.RIGHT_PARENTHESIS_CHAR) { + buf.append(next); } else { - // restitute the escape char (because it was consumed + // restitute the escape char (because it was consumed // before this method was called). buf.append("\\"); // restitute the next character diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java index 19be55a..0e99868 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/DefaultTimeBasedFileNamingAndTriggeringPolicy.java @@ -21,10 +21,11 @@ import ch.qos.logback.core.rolling.helper.DefaultArchiveRemover; /** * * @author Ceki Gülcü - * + * * @param <E> */ -public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedFileNamingAndTriggeringPolicyBase<E> { +public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends + TimeBasedFileNamingAndTriggeringPolicyBase<E> { @Override public void start() { @@ -33,7 +34,7 @@ public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedF archiveRemover.setContext(context); started = true; } - + public boolean isTriggeringEvent(File activeFile, final E event) { long time = getCurrentTime(); if (time >= nextCheck) { @@ -47,4 +48,9 @@ public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedF return false; } } + + @Override + public String toString() { + return "c.q.l.core.rolling.DefaultTimeBasedFileNamingAndTriggeringPolicy"; + } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java index cc425e1..88adfe6 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileNamePattern.java @@ -58,7 +58,12 @@ public class FileNamePattern extends ContextAwareBase { void parse() { try { - Parser<Object> p = new Parser<Object>(pattern, new AlmostAsIsEscapeUtil()); + // http://jira.qos.ch/browse/LBCORE-130 + // we escape ')' for parsing purposes. Note that the original pattern is preserved + // because it is shown to the user in status messages. We don't want the escaped version + // to leak out. + String patternForParsing = escapeRightParantesis(pattern); + Parser<Object> p = new Parser<Object>(patternForParsing, new AlmostAsIsEscapeUtil()); p.setContext(context); Node t = p.parse(); this.headTokenConverter = p.compile(t, CONVERTER_MAP); @@ -68,6 +73,10 @@ public class FileNamePattern extends ContextAwareBase { } } + String escapeRightParantesis(String in) { + return pattern.replace(")", "\\)"); + } + public String toString() { return pattern; } @@ -145,8 +154,8 @@ public class FileNamePattern extends ContextAwareBase { } /** - * Given date, convert this instance to a regular expression. - */ + * Given date, convert this instance to a regular expression. + */ public String toRegex(Date date) { StringBuilder buf = new StringBuilder(); Converter<Object> p = headTokenConverter; diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java index 93a029d..4b4cdf9 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/RollingFileAppenderTest.java @@ -30,6 +30,7 @@ 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.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; @@ -39,6 +40,8 @@ public class RollingFileAppenderTest extends AbstractAppenderTest<Object> { Context context = new ContextBase(); TimeBasedRollingPolicy<Object> tbrp = new TimeBasedRollingPolicy<Object>(); + int diff = RandomUtil.getPositiveInt(); + String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"; @Before public void setUp() throws Exception { @@ -63,7 +66,8 @@ public class RollingFileAppenderTest extends AbstractAppenderTest<Object> { @Override protected Appender<Object> getConfiguredAppender() { rfa.setContext(context); - tbrp.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX+"toto-%d.log"); + tbrp + .setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "toto-%d.log"); tbrp.start(); rfa.setRollingPolicy(tbrp); @@ -81,7 +85,8 @@ public class RollingFileAppenderTest extends AbstractAppenderTest<Object> { rfa.setBufferedIO(true); rfa.setPrudent(true); - tbrp.setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX+"toto-%d.log"); + tbrp + .setFileNamePattern(CoreTestConstants.OUTPUT_DIR_PREFIX + "toto-%d.log"); tbrp.start(); rfa.setRollingPolicy(tbrp); @@ -133,4 +138,17 @@ public class RollingFileAppenderTest extends AbstractAppenderTest<Object> { statusChecker.containsMatch(Status.ERROR, "File property must be set before any triggeringPolicy "); } + + @Test + public void testFileNameWithParenthesis() { + // if ')' is not escaped, the test throws + // java.lang.IllegalStateException: FileNamePattern [.../program(x86)/toto-%d.log] does not contain a valid DateToken + rfa.setContext(context); + tbrp + .setFileNamePattern(randomOutputDir + "program(x86)/toto-%d.log"); + tbrp.start(); + rfa.setRollingPolicy(tbrp); + rfa.start(); + rfa.doAppend("hello"); + } } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 8dfab6b..4e27d5b 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -42,6 +42,10 @@ prevents compatibility issues, in particular with recent versions of Tomcat whcih store request header names in lower-case.</p> + <p>Fixed <a + href="http://jira.qos.ch/browse/LBCORE-130">LBCORE-130</a>. <code>FileNamePattern</code> + no longer treats parenthesis as special. + </p> <hr width="80%" align="center" /> diff --git a/logback-site/src/site/pages/templates/footer.js b/logback-site/src/site/pages/templates/footer.js index 6e51ecc..f97c725 100644 --- a/logback-site/src/site/pages/templates/footer.js +++ b/logback-site/src/site/pages/templates/footer.js @@ -10,7 +10,7 @@ document.write('  ') //document.write(' alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>') document.write(' </td>') -document.write('<td valign="top">Copyright © 1999-2009 <a href="http://www.qos.ch/">QOS.ch</a></td>') +document.write('<td valign="top">Copyright © 1999-2010 <a href="http://www.qos.ch/">QOS.ch</a></td>') document.write('</tr>') document.write('</table>') diff --git a/logback-site/src/site/pages/templates/left.js b/logback-site/src/site/pages/templates/left.js index ac41531..b45f09c 100644 --- a/logback-site/src/site/pages/templates/left.js +++ b/logback-site/src/site/pages/templates/left.js @@ -1,17 +1,22 @@ document.write('<p class="menu_header">Logback project</p>'); document.write('<p class="menu"><a href="' + prefix + 'index.html">Introduction</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'news.html">News</a></p>'); document.write('<p class="menu"><a href="' + prefix + 'download.html">Download</a></p>'); document.write('<p class="menu"><a href="' + prefix + 'documentation.html">Documentation</a></p>'); +document.write('<p class="menu"><a href="' + prefix + 'license.html">License</a></p>'); +document.write('<p class="menu"><a href="' + prefix + 'news.html">News</a></p>'); + +document.write('<p class="menu_header">Support</p>'); document.write('<p class="menu"><a href="' + prefix + 'mailinglist.html">Mailing Lists</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'repos.html">Source Repository</a></p>'); document.write('<p class="menu"><a href="' + prefix + 'bugreport.html">Bug Report</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'license.html">License</a></p>'); -document.write('<p class="menu"><a href="http://logback.qos.ch/translator/">log4j.properties Translator</a>'); +document.write('<p class="menu"><a href="' + prefix + 'repos.html">Source Repository</a></p>'); + document.write('<p class="menu"><a href="http://www.qos.ch/shop/products/professionalSupport">Support offerings</a>'); document.write('<p class="menu"><a href="http://www.qos.ch/shop/products/training">Training</a>'); +document.write('<p class="menu_header">Online Tools</p>'); +document.write('<p class="menu"><a href="http://logback.qos.ch/translator/">log4j.properties Translator</a>'); + document.write('</p>'); ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/core/CoreConstants.java | 3 +- .../logback/core/pattern/parser/TokenStream.java | 10 +++----- .../core/pattern/util/AlmostAsIsEscapeUtil.java | 16 ++++++++------ ...aultTimeBasedFileNamingAndTriggeringPolicy.java | 12 ++++++++-- .../core/rolling/helper/FileNamePattern.java | 15 ++++++++++-- .../core/rolling/RollingFileAppenderTest.java | 22 ++++++++++++++++++- logback-site/src/site/pages/news.html | 4 +++ logback-site/src/site/pages/templates/footer.js | 2 +- logback-site/src/site/pages/templates/left.js | 13 ++++++++--- 9 files changed, 70 insertions(+), 27 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. v0.9.18-16-g7cc4562
by git-noreply＠pixie.qos.ch 08 Feb '10

08 Feb '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 7cc45624e0baed34f3750e7a8175a83b1da4c9cf (commit) from 382f13d26b9718c7a5c3a467fcda487016dd3a17 (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=7cc45624e0baed34f3750e7a… http://github.com/ceki/logback/commit/7cc45624e0baed34f3750e7a8175a83b1da4c… commit 7cc45624e0baed34f3750e7a8175a83b1da4c9cf Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Feb 8 19:28:44 2010 +0100 - added links to Support and training - removed team link because its contents were stale diff --git a/logback-site/src/site/pages/team.html b/logback-site/src/site/pages/team.html deleted file mode 100644 index 4cb3a9f..0000000 --- a/logback-site/src/site/pages/team.html +++ /dev/null @@ -1,77 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml"> - <head> - <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> - <title>Logback Team</title> - <link rel="stylesheet" type="text/css" href="css/common.css" /> - <link rel="stylesheet" type="text/css" href="css/screen.css" media="screen" /> - <link rel="stylesheet" type="text/css" href="css/_print.css" media="print" /> - - </head> - <body> - <script type="text/javascript">prefix='';</script> - - <script src="templates/header.js" type="text/javascript"></script> - <div id="left"> - <script src="templates/left.js" type="text/javascript"></script> - </div> - <div id="content"> - - - - <h2>Logback Team</h2> - - <p>Let us introduce you to the logback team members:</p> - - <table class="bodyTable" border="0" cellpadding="8"> - <tr class="a"> - <td><img src="images/jeannoel.gif" alt="Jean-Noel"/></td> - - <td> - <p>Jean-Noel Charpin has been designing and developing object - oriented software and decision making systems since 1998. He - is particularly interested in translating lean manufacturing - principles and practices to the software development domain - in order to improve quality and reliability. - </p> - </td> - </tr> - <tr class="b"> - <td><img src="images/ceki.gif" alt="Ceki"/></td> - <td> - <p>Ceki Gülcü has been working on logging systems - since 1996. He is the founder of the log4j, slf4j and - logback projects. Ceki enjoys writing software, a task far - more difficult and time-consuming than what it seems at - first sight. His interests range from cryptography, system - monitoring and testing to application interoperability. - </p> - </td> - </tr> - <tr class="a"> - <td><img src="images/seb.gif" alt="Sebastien"/></td> - <td> - <p>Sébastien Pennec has been using computers for the most - part of his life, be it as a hobby, or during his studies - or, more recently, as Software Engineer. He loves to write - software in dynamic and enthusiastic environments, while - learning new technologies and practices. - </p> - <p> - Sébastien's hobbys include writing articles about - Macintosh products on <a href="http://www.cuk.ch">cuk.ch</a>, - digital photography and playing poker with his friends. - </p> - </td> - </tr> - </table> - - - - - <script src="templates/footer.js" type="text/javascript"></script> -</div> -</body> -</html> diff --git a/logback-site/src/site/pages/templates/left.js b/logback-site/src/site/pages/templates/left.js index 035626d..ac41531 100644 --- a/logback-site/src/site/pages/templates/left.js +++ b/logback-site/src/site/pages/templates/left.js @@ -9,13 +9,8 @@ document.write('<p class="menu"><a href="' + prefix + 'repos.html">Source Reposi document.write('<p class="menu"><a href="' + prefix + 'bugreport.html">Bug Report</a></p>'); document.write('<p class="menu"><a href="' + prefix + 'license.html">License</a></p>'); document.write('<p class="menu"><a href="http://logback.qos.ch/translator/">log4j.properties Translator</a>'); -document.write('<p class="menu"><a href="' + prefix + 'team.html">Logback Team</a></p>'); -document.write('<p class="menu"><a href="' + prefix + 'support.html">Professional Support</a></p>'); - - - -document.write('<p><a class="x" href="http://www.qos.ch/"><img src="' + prefix + 'images/logos/qosLogo.png" /></a></p>'); - +document.write('<p class="menu"><a href="http://www.qos.ch/shop/products/professionalSupport">Support offerings</a>'); +document.write('<p class="menu"><a href="http://www.qos.ch/shop/products/training">Training</a>'); document.write('</p>'); ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/team.html | 77 ------------------------- logback-site/src/site/pages/templates/left.js | 9 +-- 2 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 logback-site/src/site/pages/team.html hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-185) Servlet filter which puts servlet-specific data into MDC
by Torsten Juergeleit (JIRA) 05 Feb '10

05 Feb '10

Servlet filter which puts servlet-specific data into MDC -------------------------------------------------------- Key: LBCLASSIC-185 URL: http://jira.qos.ch/browse/LBCLASSIC-185 Project: logback-classic Issue Type: New Feature Components: Other Affects Versions: 0.9.18 Reporter: Torsten Juergeleit Assignee: Logback dev list Attached you can find a servlet filter which implements a strategy to put servlet-specific data into the SL4F MDC using the following keys: * {{slf4j.servlet.requestId}} - Unique ID of the single HTTP request handled by this filter * {{slf4j.servlet.sessionId}} - ID of the HTTP session this HTTP request is associated with or "" if no HTTP session was created yet * {{slf4j.servlet.contextPath}} - Web apps context path * {{slf4j.servlet.userName}} - Name of authenticated user or "" if no user is authenticated This data is removed after the request is processed. The following configuration parameters are supported by this filter: * {{maxSessionIdLength}} - limiting the HTTP session id length to a certain value, e.g. for WebLogic this could be 52 (default: -1 [unlimited]) To use this filter add the following lines to the {{web.xml file}}: <code> <filter> <filter-name>RequestLogFilter</filter-name> <filter-class>ch.qos.logback.classic.RequestLogFilter</filter-class> <init-param> <param-name>maxSessionIdLength</param-name> <param-value>52</param-value> </init-param> </filter><br> : <filter-mapping> <filter-name>RequestLogFilter</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> <code> An SLF4 Logger named {{ch.qos.logback.classic.RequestLogFilter}} is used to log the start end end of calling the filter chain. This information should go into a separate log file. -- 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

3 6