- logback-dev - mailman3.qos.ch

[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

[JIRA] Created: (LBCORE-253) TMP file not delete when archiver enabled
by yair ogen (JIRA) 22 Apr '12

22 Apr '12

TMP file not delete when archiver enabled ----------------------------------------- Key: LBCORE-253 URL: http://jira.qos.ch/browse/LBCORE-253 Project: logback-core Issue Type: Bug Components: Appender Affects Versions: 1.0.0 Environment: Linux, Windows Reporter: yair ogen Assignee: Logback dev list Priority: Critical If I enable archiving when the log directory exist but is empty everything works fine. new files are rolled and archived. TMP files are deleted. If I enable archiving when the log directory contains a gz file (even only one) - then the TMP doesn't get deleted. The above has been observed in high load (e.g. carpet bombing the appender) and is intermittent. Still, this is critical for our customers. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

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

20 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 8646e9a3a29560176174aed181dbbd93de56c49f (commit) from e864f034eb3a642f785e1bc0a786a60cbce708ea (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=8646e9a3a29560176174aed1… http://github.com/ceki/logback/commit/8646e9a3a29560176174aed181dbbd93de56c… commit 8646e9a3a29560176174aed181dbbd93de56c49f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Apr 20 17:46:34 2012 +0200 Refactoring of DatePatternToRegexUtil and SequenceToRegex4SDF, editing in layouts.html diff --git a/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java b/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java index 279140a..255812a 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java +++ b/logback-access/src/main/java/ch/qos/logback/access/PatternLayout.java @@ -65,10 +65,10 @@ public class PatternLayout extends PatternLayoutBase<IAccessEvent> { public static final Map<String, String> defaultConverterMap = new HashMap<String, String>(); public static final String HEADER_PREFIX = "#logback.access pattern: "; - public static String CLF_PATTERN = "%h %l %u %t \"%r\" %s %b"; + public static String CLF_PATTERN = "%h %l %u [%t] \"%r\" %s %b"; public static String CLF_PATTERN_NAME = "common"; public static String CLF_PATTERN_NAME_2 = "clf"; - public static String COMBINED_PATTERN = "%h %l %u %t \"%r\" %s %b \"%i{Referer}\" \"%i{User-Agent}\""; + public static String COMBINED_PATTERN = "%h %l %u [%t] \"%r\" %s %b \"%i{Referer}\" \"%i{User-Agent}\""; public static String COMBINED_PATTERN_NAME = "combined"; static { 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 f779888..90a59ab 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 @@ -19,6 +19,7 @@ import java.util.List; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.pattern.DynamicConverter; import ch.qos.logback.core.util.CachingDateFormatter; +import ch.qos.logback.core.util.DatePatternToRegexUtil; /** * Returns a date formatted by SimpleDateFormatter. diff --git a/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceState.java b/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceState.java new file mode 100644 index 0000000..38b206b --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceState.java @@ -0,0 +1,32 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2012, 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.util; + +/** + * Used to keep state about a char sequence. + * @author Ceki Gulcu + */ +class CharSequenceState { + final char c; + int occurrences; + + public CharSequenceState(char c) { + this.c = c; + this.occurrences = 1; + } + + void incrementOccurrences() { + occurrences++; + } +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SequenceToRegex4SDF.java b/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceToRegexMapper.java similarity index 74% rename from logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SequenceToRegex4SDF.java rename to logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceToRegexMapper.java index 4842d1e..961ad4f 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/SequenceToRegex4SDF.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/CharSequenceToRegexMapper.java @@ -11,36 +11,27 @@ * 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; /** - * This class supports mapping tokens (set of same character sequences) to + * This class supports mapping character sequences to * regular expressions as appropriate for SimpleDateFormatter. * - * @author ceki + * @author Ceki * */ -class SequenceToRegex4SDF { - final char c; - int occurrences; +class CharSequenceToRegexMapper { - public SequenceToRegex4SDF(char c) { - this.c = c; - this.occurrences = 1; - } - - void inc() { - occurrences++; - } - - String toRegex() { - switch (c) { + String toRegex(CharSequenceState css) { + final int occurrences = css.occurrences; + final char c = css.c; + switch (css.c) { case 'G': case 'z': return ".*"; case 'M': if (occurrences >= 3) { - return ".*"; + return ".\\{3,12}"; } else { return number(occurrences); } @@ -82,12 +73,7 @@ class SequenceToRegex4SDF { } } - @Override - public String toString() { - return c + "(" + occurrences + ")"; - } - - private String number(int occurences) { + private String number(int occurrences) { return "\\d{" + occurrences + "}"; } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DatePatternToRegexUtil.java b/logback-core/src/main/java/ch/qos/logback/core/util/DatePatternToRegexUtil.java similarity index 58% rename from logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DatePatternToRegexUtil.java rename to logback-core/src/main/java/ch/qos/logback/core/util/DatePatternToRegexUtil.java index a8fc939..ad546f7 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DatePatternToRegexUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/util/DatePatternToRegexUtil.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 java.text.SimpleDateFormat; import java.util.ArrayList; @@ -20,47 +20,43 @@ import java.util.List; /** * This class is concerned with computing a regex corresponding to a date * pattern (in {@link SimpleDateFormat} format). - * + * * @author Ceki Gülcü - * */ public class DatePatternToRegexUtil { final String datePattern; - final int length; + final int datePatternLength; + final CharSequenceToRegexMapper regexMapper = new CharSequenceToRegexMapper(); DatePatternToRegexUtil(String datePattern) { this.datePattern = datePattern; - length = datePattern.length(); + datePatternLength = datePattern.length(); } String toRegex() { - List<SequenceToRegex4SDF> sequenceList = tokenize(); + List<CharSequenceState> charSequenceList = tokenize(); StringBuilder sb = new StringBuilder(); - for (SequenceToRegex4SDF seq : sequenceList) { - sb.append(seq.toRegex()); + for (CharSequenceState seq : charSequenceList) { + sb.append(regexMapper.toRegex(seq)); } return sb.toString(); } - private List<SequenceToRegex4SDF> tokenize() { - List<SequenceToRegex4SDF> sequenceList = new ArrayList<SequenceToRegex4SDF>(); - SequenceToRegex4SDF sequence = null; - for (int i = 0; i < length; i++) { + private List<CharSequenceState> tokenize() { + List<CharSequenceState> sequenceList = new ArrayList<CharSequenceState>(); + + CharSequenceState lastCharSequenceState = null; + + for (int i = 0; i < datePatternLength; i++) { char t = datePattern.charAt(i); - if (sequence == null || sequence.c != t) { - sequence = addNewSequence(sequenceList, t); + if (lastCharSequenceState == null || lastCharSequenceState.c != t) { + lastCharSequenceState = new CharSequenceState(t); + sequenceList.add(lastCharSequenceState); } else { - sequence.inc(); + lastCharSequenceState.incrementOccurrences(); } } return sequenceList; } - - SequenceToRegex4SDF addNewSequence(List<SequenceToRegex4SDF> sequenceList, - char t) { - SequenceToRegex4SDF token = new SequenceToRegex4SDF(t); - sequenceList.add(token); - return token; - } } diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html index b1145d2..dd20da2 100644 --- a/logback-site/src/site/pages/manual/layouts.html +++ b/logback-site/src/site/pages/manual/layouts.html @@ -2174,7 +2174,7 @@ public class MySampleConverter extends ClassicConverter { </table> Logback access' <code>PatternLayout</code> also recognizes three keywords, which - act like shortcuts to a certain pattern. + act like shortcuts. <table class="bodyTable"> <tr> @@ -2183,22 +2183,22 @@ public class MySampleConverter extends ClassicConverter { </tr> <tr class="a"> <td>common or CLF</td> - <td>%h %l %u %t \"%r\" %s %b</td> + <td>%h %l %u [%t] "%r" %s %b</td> </tr> <tr class="b"> <td>combined</td> - <td>%h %l %u %t \"%r\" %s %b \"%i{Referer}\" \"%i{User-Agent}\"</td> + <td>%h %l %u [%t] "%r" %s %b "%i{Referer}" "%i{User-Agent}"</td> </tr> </table> - The common keyword corresponds to the pattern %h %l %u %t \"%r\" %s %b + The common keyword corresponds to the pattern '%h %l %u [%t] "%r" %s %b' which displays client host, remote log name, user, date, requested URL, status code and response's content length - The combined keyword is a shortcut for %h %l %u %t - \"%r\" %s %b \"%i{Referer}\" \"%i{User-Agent}\". This pattern + The combined keyword is a shortcut for '%h %l %u [%t] + "%r" %s %b "%i{Referer}" "%i{User-Agent}"'. This pattern begins much like the common pattern but also displays two request headers, namely referer, and user-agent. ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/access/PatternLayout.java | 4 +- .../core/rolling/helper/DateTokenConverter.java | 1 + ...oadingException.java => CharSequenceState.java} | 19 +++++++-- .../CharSequenceToRegexMapper.java} | 34 +++++------------ .../helper => util}/DatePatternToRegexUtil.java | 40 +++++++++----------- logback-site/src/site/pages/manual/layouts.html | 12 +++--- 6 files changed, 51 insertions(+), 59 deletions(-) copy logback-core/src/main/java/ch/qos/logback/core/util/{DynamicClassLoadingException.java => CharSequenceState.java} (58%) rename logback-core/src/main/java/ch/qos/logback/core/{rolling/helper/SequenceToRegex4SDF.java => util/CharSequenceToRegexMapper.java} (74%) rename logback-core/src/main/java/ch/qos/logback/core/{rolling/helper => util}/DatePatternToRegexUtil.java (58%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-251) Add to SizeAndTimeBasedFNATP an option to delete files by file number (count) and not only by days
by yair ogen (JIRA) 19 Apr '12

19 Apr '12

Add to SizeAndTimeBasedFNATP an option to delete files by file number (count) and not only by days -------------------------------------------------------------------------------------------------- Key: LBCORE-251 URL: http://jira.qos.ch/browse/LBCORE-251 Project: logback-core Issue Type: Improvement Components: Appender Affects Versions: 1.0.1 Reporter: yair ogen Assignee: Logback dev list In Log4j there is an option to delete log files by their number. Assume you test your application with high load. You may create many many files on a daily basis. in such a case deleting the files once per day (which is the current minimum) is not enough. We need an option like: maxFileCountHistory to be supported. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0