June 2011 - logback-dev - mailman3.qos.ch

When will logback support Asynchronous Appender?
by 金剑 15 Jun '11

15 Jun '11

Hi I saw new feature request in JIRA and it was more than one year old. Why isn't such important feature in the logback release? I missed something? Best Regards! Jian Jin

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.29-1-g02da05e
by git-noreply＠pixie.qos.ch 09 Jun '11

09 Jun '11

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 02da05ef77822b6b78669c65ab463f8f3f2240ba (commit) from 0ce056dfde649ae95d5ab8bc95f7f5f232750a09 (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=02da05ef77822b6b78669c65… http://github.com/ceki/logback/commit/02da05ef77822b6b78669c65ab463f8f3f224… commit 02da05ef77822b6b78669c65ab463f8f3f2240ba Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Jun 10 00:11:54 2011 +0200 next release will be 0.9.30 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index 31ece7b..a924a95 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29</version> + <version>0.9.30-SNAPSHOT</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 14dd9c5..1836d81 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29</version> + <version>0.9.30-SNAPSHOT</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 869d561..2e4abda 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29</version> + <version>0.9.30-SNAPSHOT</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index f643fe0..6da1272 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29</version> + <version>0.9.30-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index d1d9fa4..ddd506f 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29</version> + <version>0.9.30-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index f216bf7..58e1821 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -37,7 +37,7 @@ <p>Given that events reference a snapshot of the current MDC map, the snapshot should not be cleared upon invocation of the - MDC.clear operation. This issue was reporLBCLASSIC-247ted in <a + MDC.clear operation. This issue was reported in <a href="http://jira.qos.ch/browse/LBCLASSIC-253">LBCLASSIC-253</a> by Tommy Becker and independently fixed by the changes designated to fix LBCLASSIC-254.</p> diff --git a/pom.xml b/pom.xml index 5405fd5..b9791dc 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29</version> + <version>0.9.30-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback-Parent</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- logback-site/src/site/pages/news.html | 2 +- pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 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. annotated tag, v_0.9.29, created. v_0.9.29
by git-noreply＠pixie.qos.ch 09 Jun '11

09 Jun '11

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 annotated tag, v_0.9.29 has been created at d62c70c89af5d0b41ace518ea929eee51bfcf75b (tag) tagging 0ce056dfde649ae95d5ab8bc95f7f5f232750a09 (commit) replaces v_0.9.28 tagged by Ceki Gulcu on Fri Jun 10 00:07:15 2011 +0200 - Log ----------------------------------------------------------------- tagging as 0.9.29 Ceki Gulcu (42): starting work on 0.9.29 fix LBCLASSIC-246 adding link to openRDF minor correction minor edits better error message in IfAction when janono.jar is missing less drama in conditional processing in the absence of janino library on the cp fix LBCLASSIC-248 updates to power point presentation fix LBCORE-193 minor update adding a logback related job announcement adding a logback related job announcement added a link to job.html from the header editorial changes edits to job ad more edits to job ad added doc improvements suggested by David Beamer optimized LogbackMDCAppender as requested in http://jira.qos.ch/browse/LBCLASSIC-254 make tests pass - refactoring updates to news.html ongoing work fixing LBCORE-199 dabbling in yoda time working on LRUMessageCache fixing LBCLASSIC-255 ongoing work on Dateformatting Merge branch 'master' of git.qos.ch:logback Fix LBCLASSIC-156 update the list of fixed bugs typo fix refactored millesecond cached formatting code into CachingDateFormatter Fixed LBCORE-199 by adding a timestamp to the entry found in the zip file. This was suggested by Benoit Xhenseval. SizeBasedRollingTest replaced by its Scala equivalent update copyright year to 2011 - migrating SizeAndTimeBasedFNATP_Test to scala - Further work on tests: Merge branch 'master' of git://github.com/motlin/logback into motlin/master fixing LBCLASSIC-247 added reference to LBCLASSIC-247 releasing v0.9.29 Craig P. Motlin (4): Fix typo. Fixed typo. Fixed grammar. Added missing word. Joern Huxhorn (5): Fixes LBCLASSIC-257. Added additional c'tor to LoggerContextVO. New IAccessEvent interface. Implementing IAccessEvent interface. Using IAccessEvent instead of AccessEvent if possible. Typo in documentation: changed .? to ?. in text. ----------------------------------------------------------------------- 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_0.9.28-51-g0ce056d
by git-noreply＠pixie.qos.ch 09 Jun '11

09 Jun '11

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 0ce056dfde649ae95d5ab8bc95f7f5f232750a09 (commit) from 20ccbc83f6c5029e9a48fb526f2dabf30ad7afbb (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=0ce056dfde649ae95d5ab8bc… http://github.com/ceki/logback/commit/0ce056dfde649ae95d5ab8bc95f7f5f232750… commit 0ce056dfde649ae95d5ab8bc95f7f5f232750a09 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Fri Jun 10 00:05:47 2011 +0200 releasing v0.9.29 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index aad6118..31ece7b 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29-SNAPSHOT</version> + <version>0.9.29</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 3aa7b7c..14dd9c5 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29-SNAPSHOT</version> + <version>0.9.29</version> </parent> <artifactId>logback-classic</artifactId> 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 199e5aa..3d8fb32 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 @@ -303,7 +303,7 @@ public class JoranConfiguratorTest { StatusPrinter.print(loggerContext); StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree()); - assertTrue(checker.containsMatch("Resetting and reconfiguring context")); + assertTrue(checker.containsMatch("Will reset and reconfigure context")); } @Test diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 24671f3..869d561 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29-SNAPSHOT</version> + <version>0.9.29</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 3ce794e..f643fe0 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29-SNAPSHOT</version> + <version>0.9.29</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index bba24eb..d1d9fa4 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29-SNAPSHOT</version> + <version>0.9.29</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 8989fe8..f216bf7 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -28,7 +28,7 @@ <hr width="80%" align="center" /> - <h3>xxx, 2011 - Release of version 0.9.29</h3> + <h3>June 9th, 2011 - Release of version 0.9.29</h3> <p>Fixed <a href="http://jira.qos.ch/browse/LBCLASSIC-254">LBCLASSIC-254</a>, @@ -37,7 +37,7 @@ <p>Given that events reference a snapshot of the current MDC map, the snapshot should not be cleared upon invocation of the - MDC.clear operation. This issue was reported in <a + MDC.clear operation. This issue was reporLBCLASSIC-247ted in <a href="http://jira.qos.ch/browse/LBCLASSIC-253">LBCLASSIC-253</a> by Tommy Becker and independently fixed by the changes designated to fix LBCLASSIC-254.</p> diff --git a/pom.xml b/pom.xml index 7b38899..5405fd5 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.29-SNAPSHOT</version> + <version>0.9.29</version> <packaging>pom</packaging> <name>Logback-Parent</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- .../classic/joran/JoranConfiguratorTest.java | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- logback-site/src/site/pages/news.html | 4 ++-- pom.xml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Release of logback v0.9.29
by Ceki Gülcü 09 Jun '11

09 Jun '11

Hello all, I am happy to announce the release of logback version 0.9.29. Please refer to the news page for precise details. http://logback.qos.ch/news.html You can download logback, including full source code, class files and documentation on our download page, shown below. http://logback.qos.ch/download.html You can receive logback related announcements by subscribing to the QOS.ch announce mailing list. To subscribe to QOS.ch announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/announce Enjoy, -- Ceki

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.28-50-g20ccbc8
by git-noreply＠pixie.qos.ch 09 Jun '11

09 Jun '11

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 20ccbc83f6c5029e9a48fb526f2dabf30ad7afbb (commit) from 7117a1fff64207903d99bfbd4d89de3c5d70eafe (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=20ccbc83f6c5029e9a48fb52… http://github.com/ceki/logback/commit/20ccbc83f6c5029e9a48fb526f2dabf30ad7a… commit 20ccbc83f6c5029e9a48fb526f2dabf30ad7afbb Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Jun 9 23:29:43 2011 +0200 added reference to LBCLASSIC-247 diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 6403d6f..8989fe8 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -53,9 +53,12 @@ message when it encouters a configuraton file placed in a jar file, fixing <a href="http://jira.qos.ch/browse/LBCLASSIC-246">LBCLASSIC-246</a> - as reported by Joern Huxhorn. + as reported by Joern Huxhorn. This release also fixes <a + href="http://jira.qos.ch/browse/LBCLASSIC-247">LBCLASSIC-247</a> + reported by Michael Franz. </p> + <p>Logback now emits a clearer error message in case a conversion pattern misses a closing parenthesis or if an openening parenthesis is misplaced. This fixes <a ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/news.html | 5 ++++- 1 files changed, 4 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. v_0.9.28-49-g7117a1f
by git-noreply＠pixie.qos.ch 09 Jun '11

09 Jun '11

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 7117a1fff64207903d99bfbd4d89de3c5d70eafe (commit) from 138ac6971a6052445019f7629a22cf83d4e78d6c (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=7117a1fff64207903d99bfbd… http://github.com/ceki/logback/commit/7117a1fff64207903d99bfbd4d89de3c5d70e… commit 7117a1fff64207903d99bfbd4d89de3c5d70eafe Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Jun 9 23:24:31 2011 +0200 fixing LBCLASSIC-247 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java index 666ebfd..c514c68 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeFilter.java @@ -110,7 +110,6 @@ public class ReconfigureOnChangeFilter extends TurboFilter { // reader lock. private void detachReconfigurationToNewThread() { addInfo("Detected change in [" + cwl.getCopyOfFileWatchList() + "]"); - addInfo("Resetting and reconfiguring context [" + context.getName() + "]"); new ReconfiguringThread().start(); } @@ -141,17 +140,13 @@ public class ReconfigureOnChangeFilter extends TurboFilter { class ReconfiguringThread extends Thread { public void run() { + if(mainConfigurationURL == null) { + addInfo("Due to missing top level configuration file, skipping reconfiguration"); + return; + } LoggerContext lc = (LoggerContext) context; - if (mainConfigurationURL.toString().endsWith("groovy")) { - if (EnvUtil.isGroovyAvailable()) { - lc.reset(); - // avoid directly referring to GafferConfigurator so as to avoid - // loading groovy.lang.GroovyObject . See also http://jira.qos.ch/browse/LBCLASSIC-214 - GafferUtil.runGafferConfiguratorOn(lc, this, mainConfigurationURL); - } else { - addError("Groovy classes are not available on the class path. ABORTING INITIALIZATION."); - } - } else if (mainConfigurationURL.toString().endsWith("xml")) { + addInfo("Will reset and reconfigure context named [" + context.getName() + "]"); + if (mainConfigurationURL.toString().endsWith("xml")) { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(context); lc.reset(); @@ -162,6 +157,15 @@ public class ReconfigureOnChangeFilter extends TurboFilter { } catch (JoranException e) { addError("Failure during reconfiguration", e); } + } else if (mainConfigurationURL.toString().endsWith("groovy")) { + if (EnvUtil.isGroovyAvailable()) { + lc.reset(); + // avoid directly referring to GafferConfigurator so as to avoid + // loading groovy.lang.GroovyObject . See also http://jira.qos.ch/browse/LBCLASSIC-214 + GafferUtil.runGafferConfiguratorOn(lc, this, mainConfigurationURL); + } else { + addError("Groovy classes are not available on the class path. ABORTING INITIALIZATION."); + } } } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java index 7fe39f2..cb21a9f 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/turbo/ReconfigureOnChangeTest.java @@ -16,13 +16,13 @@ package ch.qos.logback.classic.turbo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.File; -import java.io.IOException; +import java.io.*; import java.net.MalformedURLException; import java.util.Random; import ch.qos.logback.classic.gaffer.GafferConfigurator; import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; +import org.hsqldb.lib.StringInputStream; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -107,6 +107,12 @@ public class ReconfigureOnChangeTest { jc.doConfigure(file); } + void configure(InputStream is) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(loggerContext); + jc.doConfigure(is); + } + void gConfigure(File file) throws JoranException { GafferConfigurator gc = new GafferConfigurator(loggerContext); gc.run(file); @@ -122,8 +128,11 @@ public class ReconfigureOnChangeTest { } - void doScanTest(File topLevelFile, File fileToTouch) throws JoranException, IOException, InterruptedException { - configure(topLevelFile); + void doScanTest(File fileToTouch) throws JoranException, IOException, InterruptedException { + doScanTest(fileToTouch, false); + } + + void doScanTest(File fileToTouch, boolean forcedReconfigurationSkip) throws JoranException, IOException, InterruptedException { RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(fileToTouch); harness.execute(runnableArray); @@ -131,8 +140,10 @@ public class ReconfigureOnChangeTest { new InfoStatus("end of execution ", this)); long expectedReconfigurations = runnableArray[0].getCounter(); - verify(expectedReconfigurations); + if(forcedReconfigurationSkip) + expectedReconfigurations = 0; + verify(expectedReconfigurations); } // chose a test at random. These tests are rather long... @@ -155,24 +166,39 @@ public class ReconfigureOnChangeTest { } // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter + @Test public void scan1() throws JoranException, IOException, InterruptedException { File file = new File(SCAN1_FILE_AS_STR); - doScanTest(file, file); + configure(file); + doScanTest(file); } + @Test public void scanWithFileInclusion() throws JoranException, IOException, InterruptedException { File topLevelFile = new File(INCLUSION_SCAN_TOPLEVEL0_AS_STR); File innerFile = new File(INCLUSION_SCAN_INNER0_AS_STR); - doScanTest(topLevelFile, innerFile); + configure(topLevelFile); + doScanTest(innerFile); } + @Test public void scanWithResourceInclusion() throws JoranException, IOException, InterruptedException { File topLevelFile = new File(INCLUSION_SCAN_TOP_BY_RESOURCE_AS_STR); File innerFile = new File(INCLUSION_SCAN_INNER1_AS_STR); - doScanTest(topLevelFile, innerFile); + configure(topLevelFile); + doScanTest(innerFile); } + // See also http://jira.qos.ch/browse/LBCLASSIC-247 + @Test + public void includeScanViaInputStreamSuppliedConfigFile() throws IOException, JoranException, InterruptedException { + String configurationStr = "<configuration scan=\"true\" scanPeriod=\"50 millisecond\"><include resource=\"asResource/inner1.xml\"/></configuration>"; + configure(new ByteArrayInputStream(configurationStr.getBytes("UTF-8"))); + File innerFile = new File(INCLUSION_SCAN_INNER1_AS_STR); + doScanTest(innerFile, true); + } + @Test public void gscan1() throws JoranException, IOException, InterruptedException { File file = new File(G_SCAN1_FILE_AS_STR); gConfigure(file); @@ -188,6 +214,7 @@ public class ReconfigureOnChangeTest { // check for deadlocks //Attr_Test(timeout = 20000) + @Test public void scan_lbclassic154() throws JoranException, IOException, InterruptedException { File file = new File(SCAN_LBCLASSIC_154_FILE_AS_STR); @@ -203,14 +230,19 @@ public class ReconfigureOnChangeTest { } + + void verify(long expectedReconfigurations) { StatusChecker checker = new StatusChecker(loggerContext); StatusPrinter.print(loggerContext); assertTrue(checker.isErrorFree()); int effectiveResets = checker - .matchCount("Resetting and reconfiguring context"); + .matchCount("Will reset and reconfigure context"); // the number of effective resets must be equal or less than // expectedReconfigurations + System.out.println("effectiveResets="+effectiveResets); + + System.out.println("expectedReconfigurations="+expectedReconfigurations); assertTrue(effectiveResets <= expectedReconfigurations); // however, there should be some effective resets 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 2881ad0..d04972e 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 @@ -112,6 +112,7 @@ public class CoreConstants { static public final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; public static String CONFIGURATION_WATCH_LIST = "CONFIGURATION_WATCH_LIST"; + public static String CONFIGURATION_WATCH_LIST_RESET = "CONFIGURATION_WATCH_LIST_RESET"; /** diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java b/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java index 22970fa..294c2ea 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/GenericConfigurator.java @@ -115,8 +115,14 @@ public abstract class GenericConfigurator extends ContextAwareBase { addDefaultNestedComponentRegistryRules(ec.getDefaultNestedComponentRegistry()); } + // this is the most inner form of doConfigure whereto other doConfigure + // methods ultimately delegate final public void doConfigure(final InputSource inputSource) throws JoranException { + + if(!ConfigurationWatchListUtil.wasConfigurationWatchListReset(context)) { + informContextOfURLUsedForConfiguration(null); + } SaxEventRecorder recorder = new SaxEventRecorder(); recorder.setContext(context); recorder.recordEvents(inputSource); diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java index 9ce695d..c134ecc 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java @@ -37,9 +37,15 @@ public class ConfigurationWatchList extends ContextAwareBase { fileWatchList.clear(); } + /** + * The mainURL for the configuration file. Null values are allowed. + * @param mainURL + */ public void setMainURL(URL mainURL) { + // main url can be null this.mainURL = mainURL; - addAsFileToWatch(mainURL); + if (mainURL != null) + addAsFileToWatch(mainURL); } private void addAsFileToWatch(URL url) { @@ -58,9 +64,10 @@ public class ConfigurationWatchList extends ContextAwareBase { return mainURL; } - public List<File> getCopyOfFileWatchList() { + public List<File> getCopyOfFileWatchList() { return new ArrayList<File>(fileWatchList); } + public boolean changeDetected() { int len = fileWatchList.size(); for (int i = 0; i < len; i++) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java index 2c7955f..6e61408 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java @@ -46,6 +46,7 @@ public class ConfigurationWatchListUtil { } else { cwl.clear(); } + setConfigurationWatchListResetFlag(context, true); cwl.setMainURL(url); } @@ -59,6 +60,18 @@ public class ConfigurationWatchListUtil { } } + public static boolean wasConfigurationWatchListReset(Context context) { + Object o = context.getObject(CoreConstants.CONFIGURATION_WATCH_LIST_RESET); + if(o == null) + return false; + else { + return ((Boolean) o).booleanValue(); + } + } + public static void setConfigurationWatchListResetFlag(Context context, boolean val) { + context.putObject(CoreConstants.CONFIGURATION_WATCH_LIST_RESET, new Boolean(val)); + } + public static ConfigurationWatchList getConfigurationWatchList(Context context) { return (ConfigurationWatchList) context.getObject(CoreConstants.CONFIGURATION_WATCH_LIST); } ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeFilter.java | 26 ++++++---- .../classic/turbo/ReconfigureOnChangeTest.java | 50 ++++++++++++++++---- .../java/ch/qos/logback/core/CoreConstants.java | 1 + .../logback/core/joran/GenericConfigurator.java | 6 ++ .../core/joran/spi/ConfigurationWatchList.java | 11 ++++- .../joran/util/ConfigurationWatchListUtil.java | 13 +++++ 6 files changed, 85 insertions(+), 22 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-274) Typo in documentation: .? instead of ?.
by Joern Huxhorn (JIRA) 09 Jun '11

09 Jun '11

Typo in documentation: .? instead of ?. --------------------------------------- Key: LBCLASSIC-274 URL: http://jira.qos.ch/browse/LBCLASSIC-274 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.29 Reporter: Joern Huxhorn Assignee: Logback dev list Priority: Trivial See https://github.com/ceki/logback/pull/14 -- 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. v_0.9.28-48-g138ac69
by git-noreply＠pixie.qos.ch 09 Jun '11

09 Jun '11

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 138ac6971a6052445019f7629a22cf83d4e78d6c (commit) from 8d072bf22a0b9528f6b6e9167cacb3111db7b09b (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=138ac6971a6052445019f762… http://github.com/ceki/logback/commit/138ac6971a6052445019f7629a22cf83d4e78… commit 138ac6971a6052445019f7629a22cf83d4e78d6c Author: Joern Huxhorn <jhuxhorn(a)googlemail.com> Date: Wed Jun 8 10:09:03 2011 +0200 Typo in documentation: changed .? to ?. in text. The example was already correct. diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index 0d9e9dd..f4f63d5 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -345,7 +345,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { <code>/Googlebot|msnbot|Yahoo/</code> regular expression. Note that since the MDC map can be null, we are also using Groovy's <a href="http://groovy.codehaus.org/Null+Object+Pattern">safe - dereferencing operator</a>, that is the .? operator. The equivalent + dereferencing operator</a>, that is the ?. operator. The equivalent logic would have been much longer if expressed in Java. </p> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/manual/filters.html | 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. v_0.9.28-47-g8d072bf
by git-noreply＠pixie.qos.ch 01 Jun '11

01 Jun '11

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 8d072bf22a0b9528f6b6e9167cacb3111db7b09b (commit) via b2afdd8ab6819775c7821ce95a2926a6f0a0fe89 (commit) via 5d64d2d572d880550f1cb277daf38406d30b3936 (commit) via 2748f40c778635aa5243e87d6f66e0d62b1d76a2 (commit) via bdc30d5d47ae6832310ddbf8b9ba42fb8a905e24 (commit) from 9361dc343687d87e376b5fbf3216fc4c88395074 (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=8d072bf22a0b9528f6b6e916… http://github.com/ceki/logback/commit/8d072bf22a0b9528f6b6e9167cacb3111db7b… commit 8d072bf22a0b9528f6b6e9167cacb3111db7b09b Merge: 9361dc3 b2afdd8 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Thu Jun 2 00:08:37 2011 +0200 Merge branch 'master' of git://github.com/motlin/logback into motlin/master http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=b2afdd8ab6819775c7821ce9… http://github.com/ceki/logback/commit/b2afdd8ab6819775c7821ce95a2926a6f0a0f… commit b2afdd8ab6819775c7821ce95a2926a6f0a0fe89 Author: Craig P. Motlin <cmotlin(a)gmail.com> Date: Sun Feb 13 22:57:43 2011 -0800 Added missing word. diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index c6c5a71..6bc457b 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1554,7 +1554,7 @@ fileName=myApp.log or system properties are accessible. For a key passed as argument, the <code>property</code>() or its shorter equivalent <code>p</code>() methods return the String value of the property. - For example, to access the value a property with key "k", you would + For example, to access the value of a property with key "k", you would write <code>property("k")</code> or equivalently <code>p("k")</code>. If the property with key "k" is undefined, the property method will return the empty string and not null. This http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=5d64d2d572d880550f1cb277… http://github.com/ceki/logback/commit/5d64d2d572d880550f1cb277daf38406d30b3… commit 5d64d2d572d880550f1cb277daf38406d30b3936 Author: Craig P. Motlin <cmotlin(a)gmail.com> Date: Sat Feb 12 23:02:40 2011 -0800 Fixed grammar. diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 38a8de0..c6c5a71 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -694,8 +694,7 @@ public class MyApp3 { <p>Since logback version 0.9.17, tag names pertaining to explicit - rules are case insensitive. For example, both - <code><logger></code>, <code><Logger></code> and + rules are case insensitive. For example, <code><logger></code>, <code><Logger></code> and <code><LOGGER></code> are valid configuration elements and will be interpreted in the same way. Note that XML well-formedness rules still apply, if you open a tag as <code><xyz></code> you http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=2748f40c778635aa5243e87d… http://github.com/ceki/logback/commit/2748f40c778635aa5243e87d6f66e0d62b1d7… commit 2748f40c778635aa5243e87d6f66e0d62b1d76a2 Author: Craig P. Motlin <cmotlin(a)gmail.com> Date: Fri Feb 11 19:07:03 2011 -0800 Fixed typo. diff --git a/logback-site/src/site/pages/manual/architecture.html b/logback-site/src/site/pages/manual/architecture.html index 9a3f956..aeb158a 100644 --- a/logback-site/src/site/pages/manual/architecture.html +++ b/logback-site/src/site/pages/manual/architecture.html @@ -907,7 +907,7 @@ logger.debug("Value {} was inserted between {} and {}.", paramArray);</pre> created. Should the level of a parent logger be changed, then all child loggers are contacted to take notice of the change. Thus, before accepting or denying a request based on the effective - level, the logger can make an quasi-instantaneous decision, + level, the logger can make a quasi-instantaneous decision, without needing to consult its ancestors. </p> http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=bdc30d5d47ae6832310ddbf8… http://github.com/ceki/logback/commit/bdc30d5d47ae6832310ddbf8b9ba42fb8a905… commit bdc30d5d47ae6832310ddbf8b9ba42fb8a905e24 Author: Craig P. Motlin <cmotlin(a)gmail.com> Date: Thu Feb 10 10:42:51 2011 -0800 Fix typo. diff --git a/logback-site/src/site/pages/faq.html b/logback-site/src/site/pages/faq.html index 195f83e..2fa8465 100644 --- a/logback-site/src/site/pages/faq.html +++ b/logback-site/src/site/pages/faq.html @@ -102,7 +102,7 @@ require that derivate work be licensed under the same license. While there might be debate about the exact definition of derivative work, we find such reciprocity both - justified and morally appealing -- that tis the second + justified and morally appealing -- that is the second reason for our choice of the LGPL & EPL dual-license. The subtly more liberal approach embodied in the ASL is not necessarily wrong. It is the expression of a ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/faq.html | 2 +- .../src/site/pages/manual/architecture.html | 2 +- .../src/site/pages/manual/configuration.html | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0