- logback-dev - mailman3.qos.ch

branch, master, updated. b228e86a5cee41e0617ba04a8350754a011d491a
by git-noreply＠pixie.qos.ch 01 Dec '09

01 Dec '09

The branch, master has been updated via b228e86a5cee41e0617ba04a8350754a011d491a (commit) from 1c9f5ace78ef615c63e8070abe61a074090ad755 (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=b228e86a5cee41e0617ba04a… http://github.com/ceki/logback/commit/b228e86a5cee41e0617ba04a8350754a011d4… commit b228e86a5cee41e0617ba04a8350754a011d491a Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 1 22:32:12 2009 +0100 - fixed http://jira.qos.ch/browse/LBCORE-119 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 9dec24e..4bc1f33 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 @@ -15,6 +15,7 @@ package ch.qos.logback.classic.turbo; import java.io.File; import java.net.URL; +import java.net.URLDecoder; import org.slf4j.Marker; @@ -69,10 +70,11 @@ public class ReconfigureOnChangeFilter extends TurboFilter { } } + @SuppressWarnings("deprecation") File convertToFile(URL url) { String protocol = url.getProtocol(); if ("file".equals(protocol)) { - File file = new File(url.getFile()); + File file = new File(URLDecoder.decode(url.getFile())); return file; } else { addError("URL [" + url + "] is not of type file"); diff --git a/logback-classic/src/test/input/turbo/scan 2.xml b/logback-classic/src/test/input/turbo/scan 1.xml similarity index 100% rename from logback-classic/src/test/input/turbo/scan 2.xml rename to logback-classic/src/test/input/turbo/scan 1.xml diff --git a/logback-classic/src/test/input/turbo/scan1.xml b/logback-classic/src/test/input/turbo/scan1.xml deleted file mode 100644 index d9df3a0..0000000 --- a/logback-classic/src/test/input/turbo/scan1.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE configuration> - -<configuration scan="true" scanPeriod="50 millisecond"> - <root level="ERROR"/> -</configuration> - \ No newline at end of file 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 2aa2078..76dcf1d 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 @@ -13,11 +13,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.net.MalformedURLException; +import java.net.URL; import org.junit.Before; import org.junit.Test; @@ -36,18 +38,15 @@ import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.status.InfoStatus; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.Env; -import ch.qos.logback.core.util.StatusPrinter; public class ReconfigureOnChangeTest { final static int THREAD_COUNT = 5; final static int LOOP_LEN = 1000 * 1000; + // the space in the file name mandated by http://jira.qos.ch/browse/LBCORE-119 final static String SCAN1_FILE_AS_STR = TeztConstants.TEST_DIR_PREFIX - + "input/turbo/scan1.xml"; - - final static String SCAN2_FILE_AS_STR = TeztConstants.TEST_DIR_PREFIX - + "input/turbo/scan 2.xml"; - + + "input/turbo/scan 1.xml"; + // it actually takes time for Windows to propagate file modification changes // values below 100 milliseconds can be problematic // the same propagation latency occurs in Linux but is even larger (>600 ms) @@ -84,24 +83,15 @@ public class ReconfigureOnChangeTest { return rArray; } - - @Test - public void lbcore119() throws JoranException, InterruptedException { - File file = new File(SCAN2_FILE_AS_STR); - - JoranConfigurator jc = new JoranConfigurator(); - jc.setContext(loggerContext); - jc.doConfigure(file); - - RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); - harness.execute(runnableArray); - - loggerContext.getStatusManager().add( - new InfoStatus("end of execution ", this)); - - long expectedRreconfigurations = runnableArray[0].getCounter(); - verify(expectedRreconfigurations); - + + + @Test // See http://jira.qos.ch/browse/LBCORE-119 + public void fileToURLAndBack() throws MalformedURLException { + File file = new File("a b.xml"); + URL url = file.toURI().toURL(); + ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter(); + File back = rocf.convertToFile(url); + assertEquals(file.getName(), back.getName()); } // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter @@ -119,26 +109,21 @@ public class ReconfigureOnChangeTest { verify(expectedRreconfigurations); } - void verify(long expectedRreconfigurations) { StatusChecker checker = new StatusChecker(loggerContext); - try { - assertTrue(checker.isErrorFree()); - int effectiveResets = checker - .matchCount("Resetting and reconfiguring context"); - // the number of effective resets must be equal or less than - // expectedRreconfigurations - assertTrue(effectiveResets <= expectedRreconfigurations); - // however, there should be some effective resets - String failMsg = "effective=" + effectiveResets + ", expected=" - + expectedRreconfigurations; - assertTrue(failMsg, - (effectiveResets * 1.3) >= (expectedRreconfigurations * 1.0)); - } catch (AssertionError ae) { - StatusPrinter.print(loggerContext); - } + assertTrue(checker.isErrorFree()); + int effectiveResets = checker + .matchCount("Resetting and reconfiguring context"); + // the number of effective resets must be equal or less than + // expectedRreconfigurations + assertTrue(effectiveResets <= expectedRreconfigurations); + // however, there should be some effective resets + String failMsg = "effective=" + effectiveResets + ", expected=" + + expectedRreconfigurations; + assertTrue(failMsg, + (effectiveResets * 1.3) >= (expectedRreconfigurations * 1.0)); } - + ReconfigureOnChangeFilter initROCF() throws MalformedURLException { ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter(); rocf.setContext(loggerContext); ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeFilter.java | 4 +- .../test/input/turbo/{scan 2.xml => scan 1.xml} | 0 logback-classic/src/test/input/turbo/scan1.xml | 7 -- .../classic/turbo/ReconfigureOnChangeTest.java | 67 ++++++++------------ 4 files changed, 29 insertions(+), 49 deletions(-) rename logback-classic/src/test/input/turbo/{scan 2.xml => scan 1.xml} (100%) delete mode 100644 logback-classic/src/test/input/turbo/scan1.xml hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 1c9f5ace78ef615c63e8070abe61a074090ad755
by git-noreply＠pixie.qos.ch 01 Dec '09

01 Dec '09

The branch, master has been updated via 1c9f5ace78ef615c63e8070abe61a074090ad755 (commit) via 2e4bbf5459f43136a4a512646bfcc023f03f1476 (commit) from f73e9afc1951ff45ebaae0d0806e6126aab37bc8 (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=1c9f5ace78ef615c63e8070a… http://github.com/ceki/logback/commit/1c9f5ace78ef615c63e8070abe61a074090ad… commit 1c9f5ace78ef615c63e8070abe61a074090ad755 Merge: 2e4bbf5 f73e9af Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 1 22:06:57 2009 +0100 Merge branch 'master' of git@git.qos.ch:logback http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=2e4bbf5459f43136a4a51264… http://github.com/ceki/logback/commit/2e4bbf5459f43136a4a512646bfcc023f03f1… commit 2e4bbf5459f43136a4a512646bfcc023f03f1476 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 1 22:05:58 2009 +0100 working on LBCORE-119 diff --git a/logback-classic/src/test/input/turbo/scan 2.xml b/logback-classic/src/test/input/turbo/scan 2.xml new file mode 100644 index 0000000..d9df3a0 --- /dev/null +++ b/logback-classic/src/test/input/turbo/scan 2.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration scan="true" scanPeriod="50 millisecond"> + <root level="ERROR"/> +</configuration> + \ No newline at end of file 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 2757984..2aa2078 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 @@ -44,7 +44,10 @@ public class ReconfigureOnChangeTest { final static String SCAN1_FILE_AS_STR = TeztConstants.TEST_DIR_PREFIX + "input/turbo/scan1.xml"; - + + final static String SCAN2_FILE_AS_STR = TeztConstants.TEST_DIR_PREFIX + + "input/turbo/scan 2.xml"; + // it actually takes time for Windows to propagate file modification changes // values below 100 milliseconds can be problematic // the same propagation latency occurs in Linux but is even larger (>600 ms) @@ -66,14 +69,13 @@ public class ReconfigureOnChangeTest { } - void configure(String file) throws JoranException { + void configure(File file) throws JoranException { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(loggerContext); jc.doConfigure(file); } RunnableWithCounterAndDone[] buildRunnableArray(File configFile) { - RunnableWithCounterAndDone[] rArray = new RunnableWithCounterAndDone[THREAD_COUNT]; rArray[0] = new Updater(configFile); for (int i = 1; i < THREAD_COUNT; i++) { @@ -82,11 +84,31 @@ public class ReconfigureOnChangeTest { return rArray; } + + @Test + public void lbcore119() throws JoranException, InterruptedException { + File file = new File(SCAN2_FILE_AS_STR); + + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(loggerContext); + jc.doConfigure(file); + + RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); + harness.execute(runnableArray); + + loggerContext.getStatusManager().add( + new InfoStatus("end of execution ", this)); + + long expectedRreconfigurations = runnableArray[0].getCounter(); + verify(expectedRreconfigurations); + + } + // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter @Test public void scan1() throws JoranException, IOException, InterruptedException { - configure(SCAN1_FILE_AS_STR); File file = new File(SCAN1_FILE_AS_STR); + configure(file); RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); harness.execute(runnableArray); @@ -94,7 +116,11 @@ public class ReconfigureOnChangeTest { new InfoStatus("end of execution ", this)); long expectedRreconfigurations = runnableArray[0].getCounter(); + verify(expectedRreconfigurations); + } + + void verify(long expectedRreconfigurations) { StatusChecker checker = new StatusChecker(loggerContext); try { assertTrue(checker.isErrorFree()); @@ -112,7 +138,7 @@ public class ReconfigureOnChangeTest { StatusPrinter.print(loggerContext); } } - + ReconfigureOnChangeFilter initROCF() throws MalformedURLException { ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter(); rocf.setContext(loggerContext); ----------------------------------------------------------------------- Summary of changes: .../src/test/input/turbo/{scan1.xml => scan 2.xml} | 0 .../classic/turbo/ReconfigureOnChangeTest.java | 36 +++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) copy logback-classic/src/test/input/turbo/{scan1.xml => scan 2.xml} (100%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. f73e9afc1951ff45ebaae0d0806e6126aab37bc8
by git-noreply＠pixie.qos.ch 01 Dec '09

01 Dec '09

The branch, master has been updated via f73e9afc1951ff45ebaae0d0806e6126aab37bc8 (commit) from b018525e30ef54b8096d9c9cb9ae7db67eed1a6a (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=f73e9afc1951ff45ebaae0d0… http://github.com/ceki/logback/commit/f73e9afc1951ff45ebaae0d0806e6126aab37… commit f73e9afc1951ff45ebaae0d0806e6126aab37bc8 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 1 14:12:51 2009 +0100 Fixed http://jira.qos.ch/browse/LBCORE-127 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 4693400..2346adf 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 @@ -45,7 +45,8 @@ public abstract class GenericConfigurator extends ContextAwareBase { informContextOfURLUsedForConfiguration(url); URLConnection urlConnection = url.openConnection(); // per http://jira.qos.ch/browse/LBCORE-105 - urlConnection.setDefaultUseCaches(false); + // per http://jira.qos.ch/browse/LBCORE-127 + urlConnection.setUseCaches(false); InputStream in = urlConnection.getInputStream(); doConfigure(in); diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java index 9e5ea44..d35f106 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java @@ -17,13 +17,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.net.URL; +import java.net.URLConnection; import java.util.HashMap; import java.util.jar.JarOutputStream; import java.util.zip.ZipEntry; @@ -107,7 +106,7 @@ public class TrivialConfiguratorTest { @Test public void lbcore105() throws IOException, JoranException { String jarEntry = "buzz.xml"; - File jarFile = makeJarFile(); + File jarFile = makeRandomJarFile(); fillInJarFile(jarFile, jarEntry); URL url = asURL(jarFile, jarEntry); TrivialConfigurator tc = new TrivialConfigurator(rulesMap); @@ -121,36 +120,35 @@ public class TrivialConfiguratorTest { @Test public void lbcore127() throws IOException, JoranException { String jarEntry = "buzz.xml"; - String jarEntry2 = "Lightyear.xml"; - - File jarFile = makeJarFile(); + String jarEntry2 = "lightyear.xml"; + + File jarFile = makeRandomJarFile(); fillInJarFile(jarFile, jarEntry, jarEntry2); - - URL url = asURL(jarFile, jarEntry); + URL url1 = asURL(jarFile, jarEntry); URL url2 = asURL(jarFile, jarEntry2); - InputStream resourceAsStream = url2.openStream(); - BufferedReader reader = new BufferedReader(new InputStreamReader( - resourceAsStream)); + URLConnection urlConnection2 = url2.openConnection(); + urlConnection2.setUseCaches(false); + InputStream is = urlConnection2.getInputStream(); TrivialConfigurator tc = new TrivialConfigurator(rulesMap); tc.setContext(context); - tc.doConfigure(url); - reader.readLine(); - - reader.close(); + tc.doConfigure(url1); + + is.read(); + is.close(); // deleting an open file fails assertTrue(jarFile.delete()); assertFalse(jarFile.exists()); } - File makeJarFile() { + File makeRandomJarFile() { File outputDir = new File(CoreTestConstants.OUTPUT_DIR_PREFIX); outputDir.mkdirs(); - int randomInt = RandomUtil.getPositiveInt(); - return new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "foo-" + randomInt + int randomPart = RandomUtil.getPositiveInt(); + return new File(CoreTestConstants.OUTPUT_DIR_PREFIX + "foo-" + randomPart + ".jar"); } @@ -159,14 +157,14 @@ public class TrivialConfiguratorTest { fillInJarFile(jarFile, jarEntryName, null); } - private void fillInJarFile(File jarFile, String jarEntryName, - String secondJarEntry) throws IOException { + private void fillInJarFile(File jarFile, String jarEntryName1, + String jarEntryName2) throws IOException { JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile)); - jos.putNextEntry(new ZipEntry(jarEntryName)); + jos.putNextEntry(new ZipEntry(jarEntryName1)); jos.write("<x/>".getBytes()); jos.closeEntry(); - if (secondJarEntry != null) { - jos.putNextEntry(new ZipEntry(secondJarEntry)); + if (jarEntryName2 != null) { + jos.putNextEntry(new ZipEntry(jarEntryName2)); jos.write("<y/>".getBytes()); jos.closeEntry(); } ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/GenericConfigurator.java | 3 +- .../core/joran/TrivialConfiguratorTest.java | 44 +++++++++---------- 2 files changed, 23 insertions(+), 24 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. b018525e30ef54b8096d9c9cb9ae7db67eed1a6a
by git-noreply＠pixie.qos.ch 30 Nov '09

30 Nov '09

The branch, master has been updated via b018525e30ef54b8096d9c9cb9ae7db67eed1a6a (commit) from c1945db449459277f2bdd97d9bfb97253cefb4a4 (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=b018525e30ef54b8096d9c9c… http://github.com/ceki/logback/commit/b018525e30ef54b8096d9c9cb9ae7db67eed1… commit b018525e30ef54b8096d9c9cb9ae7db67eed1a6a Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Dec 1 00:12:40 2009 +0100 added a test case based on LBCORE-127 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 63cbcd1..4693400 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 @@ -46,6 +46,7 @@ public abstract class GenericConfigurator extends ContextAwareBase { URLConnection urlConnection = url.openConnection(); // per http://jira.qos.ch/browse/LBCORE-105 urlConnection.setDefaultUseCaches(false); + InputStream in = urlConnection.getInputStream(); doConfigure(in); in.close(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java index c081b4f..9e5ea44 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/TrivialConfiguratorTest.java @@ -17,9 +17,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.io.BufferedReader; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.URL; import java.util.HashMap; import java.util.jar.JarOutputStream; @@ -51,10 +54,10 @@ public class TrivialConfiguratorTest { TrivialConfigurator trivialConfigurator = new TrivialConfigurator(rulesMap); trivialConfigurator.setContext(context); - trivialConfigurator.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + "input/joran/" - + filename); + trivialConfigurator.doConfigure(CoreTestConstants.TEST_DIR_PREFIX + + "input/joran/" + filename); } - + @Test public void smoke() throws Exception { int oldBeginCount = IncAction.beginCount; @@ -115,6 +118,34 @@ public class TrivialConfiguratorTest { assertFalse(jarFile.exists()); } + @Test + public void lbcore127() throws IOException, JoranException { + String jarEntry = "buzz.xml"; + String jarEntry2 = "Lightyear.xml"; + + File jarFile = makeJarFile(); + fillInJarFile(jarFile, jarEntry, jarEntry2); + + + URL url = asURL(jarFile, jarEntry); + URL url2 = asURL(jarFile, jarEntry2); + + InputStream resourceAsStream = url2.openStream(); + BufferedReader reader = new BufferedReader(new InputStreamReader( + resourceAsStream)); + + TrivialConfigurator tc = new TrivialConfigurator(rulesMap); + tc.setContext(context); + tc.doConfigure(url); + reader.readLine(); + + reader.close(); + + // deleting an open file fails + assertTrue(jarFile.delete()); + assertFalse(jarFile.exists()); + } + File makeJarFile() { File outputDir = new File(CoreTestConstants.OUTPUT_DIR_PREFIX); outputDir.mkdirs(); @@ -125,10 +156,20 @@ public class TrivialConfiguratorTest { private void fillInJarFile(File jarFile, String jarEntryName) throws IOException { + fillInJarFile(jarFile, jarEntryName, null); + } + + private void fillInJarFile(File jarFile, String jarEntryName, + String secondJarEntry) throws IOException { JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile)); jos.putNextEntry(new ZipEntry(jarEntryName)); jos.write("<x/>".getBytes()); jos.closeEntry(); + if (secondJarEntry != null) { + jos.putNextEntry(new ZipEntry(secondJarEntry)); + jos.write("<y/>".getBytes()); + jos.closeEntry(); + } jos.close(); } ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/GenericConfigurator.java | 1 + .../core/joran/TrivialConfiguratorTest.java | 47 ++++++++++++++++++- 2 files changed, 45 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. c1945db449459277f2bdd97d9bfb97253cefb4a4
by git-noreply＠pixie.qos.ch 30 Nov '09

30 Nov '09

The branch, master has been updated via c1945db449459277f2bdd97d9bfb97253cefb4a4 (commit) from f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593 (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=c1945db449459277f2bdd97d… http://github.com/ceki/logback/commit/c1945db449459277f2bdd97d9bfb97253cefb… commit c1945db449459277f2bdd97d9bfb97253cefb4a4 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Nov 30 23:16:43 2009 +0100 - Fixed http://jira.qos.ch/browse/LBCLASSIC-102 and added relevant test cases diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 286d0e6..cbb6bea 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -215,8 +215,11 @@ of java code. --> <Import-Package> - sun.reflect;resolution:=optional, javax.*;resolution:=optional, - ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, + sun.reflect;resolution:=optional, + javax.*;resolution:=optional, + org.xml.*;resolution:=optional, + ch.qos.logback.core.rolling, + ch.qos.logback.core.rolling.helper, * </Import-Package> diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java b/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java index 03038b5..b2a9fe5 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/ClassicConstants.java @@ -14,7 +14,6 @@ package ch.qos.logback.classic; public class ClassicConstants { - static public final char LOGGER_SEPARATOR = '.'; static public final String USER_MDC_KEY = "user"; public static final String LOGBACK_CONTEXT_SELECTOR = "logback.ContextSelector"; diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java index cc3cd17..50d6de9 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/Logger.java @@ -28,6 +28,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.classic.spi.LoggerRemoteView; import ch.qos.logback.classic.spi.LoggingEvent; import ch.qos.logback.core.Appender; +import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.spi.AppenderAttachable; import ch.qos.logback.core.spi.AppenderAttachableImpl; import ch.qos.logback.core.spi.FilterReply; @@ -287,12 +288,33 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, return aai.detachAppender(appender); } + static int getSeparatorIndexOf(String name) { + return getSeparatorIndexOf(name, 0); + } + + /** + * Get the position of the separator character, if any, starting at position + * 'fromIndex'. + * + * @param name + * @param fromIndex + * @return + */ + static int getSeparatorIndexOf(String name, int fromIndex) { + int i = name.indexOf(CoreConstants.DOT, fromIndex); + if(i != -1) { + return i; + } else { + return name.indexOf(CoreConstants.DOLLAR, fromIndex); + } + } + /** * Create a child of this logger by suffix, that is, the part of the name * extending this logger. For example, if this logger is named "x.y" and the * lastPart is "z", then the created child logger will be named "x.y.z". * - * <p> IMPORTANT: Calls to this method must be within a syncronized block on + * <p> IMPORTANT: Calls to this method must be within a synchronized block on * this logger. * * @param lastPart @@ -302,11 +324,11 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, * @return */ Logger createChildByLastNamePart(final String lastPart) { - int i_index = lastPart.indexOf(ClassicConstants.LOGGER_SEPARATOR); + int i_index = getSeparatorIndexOf(lastPart); if (i_index != -1) { throw new IllegalArgumentException("Child name [" + lastPart + " passed as parameter, may not include [" - + ClassicConstants.LOGGER_SEPARATOR + "]"); + + CoreConstants.DOT + "]"); } if (childrenList == null) { @@ -317,7 +339,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, childLogger = new Logger(lastPart, this, this.loggerContext); } else { childLogger = new Logger( - name + ClassicConstants.LOGGER_SEPARATOR + lastPart, this, + name + CoreConstants.DOT + lastPart, this, this.loggerContext); } childrenList.add(childLogger); @@ -353,7 +375,7 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, static private final int DEFAULT_CHILD_ARRAY_SIZE = 5; Logger createChildByName(final String childName) { - int i_index = childName.indexOf(ClassicConstants.LOGGER_SEPARATOR, this.name + int i_index = getSeparatorIndexOf(childName, this.name .length() + 1); if (i_index != -1) { throw new IllegalArgumentException("For logger [" + this.name diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java b/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java index 0c4663a..1fdbaeb 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/LoggerContext.java @@ -134,7 +134,7 @@ public class LoggerContext extends ContextBase implements ILoggerFactory, // in between as well (if they don't already exist) String childName; while (true) { - int h = name.indexOf(ClassicConstants.LOGGER_SEPARATOR, i); + int h = Logger.getSeparatorIndexOf(name, i); if (h == -1) { childName = name; } else { diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java index eed7c7e..7f761e2 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ClassNameOnlyAbbreviator.java @@ -24,6 +24,9 @@ import ch.qos.logback.core.CoreConstants; public class ClassNameOnlyAbbreviator implements Abbreviator { public String abbreviate(String fqClassName) { + // we ignore the fact that the separator character can also be a dollar + // If the inner class is org.good.AClass#Inner, returning + // AClass#Inner seems most appropriate int lastIndex = fqClassName.lastIndexOf(CoreConstants.DOT); if (lastIndex != -1) { return fqClassName.substring(lastIndex + 1, fqClassName.length()); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java index eac2e65..f4aac29 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/TargetLengthBasedClassNameAbbreviator.java @@ -21,7 +21,7 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { final int targetLength; public TargetLengthBasedClassNameAbbreviator(int targetLength) { - this.targetLength = targetLength; + this.targetLength = targetLength; } public String abbreviate(String fqClassName) { @@ -36,9 +36,9 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { } int[] dotIndexesArray = new int[ClassicConstants.MAX_DOTS]; - // a.b.c contains 2 dots but 2+1 parts. + // a.b.c contains 2 dots but 2+1 parts. // see also http://jira.qos.ch/browse/LBCLASSIC-110 - int[] lengthArray = new int[ClassicConstants.MAX_DOTS+1]; + int[] lengthArray = new int[ClassicConstants.MAX_DOTS + 1]; int dotCount = computeDotIndexes(fqClassName, dotIndexesArray); @@ -55,8 +55,8 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { if (i == 0) { buf.append(fqClassName.substring(0, lengthArray[i] - 1)); } else { - buf.append(fqClassName.substring(dotIndexesArray[i - 1], dotIndexesArray[i - 1] - + lengthArray[i])); + buf.append(fqClassName.substring(dotIndexesArray[i - 1], + dotIndexesArray[i - 1] + lengthArray[i])); } // System.out.println("i=" + i + ", buf=" + buf); } @@ -64,11 +64,12 @@ public class TargetLengthBasedClassNameAbbreviator implements Abbreviator { return buf.toString(); } - static int computeDotIndexes(final String className, int[] dotArray) { int dotCount = 0; int k = 0; while (true) { + // ignore the $ separator in our computations. This is both convenient + // and sensible. k = className.indexOf(CoreConstants.DOT, k); if (k != -1 && dotCount < ClassicConstants.MAX_DOTS) { dotArray[dotCount] = k; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java b/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java index c490af3..b1add24 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/HLogger.java @@ -24,6 +24,7 @@ import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.Appender; +import ch.qos.logback.core.CoreConstants; public class HLogger extends MarkerIgnoringBase { @@ -237,10 +238,10 @@ public class HLogger extends MarkerIgnoringBase { * @return */ HLogger createChildByLastNamePart(final String lastPart) { - int i_index = lastPart.indexOf(ClassicConstants.LOGGER_SEPARATOR); + int i_index = lastPart.indexOf(CoreConstants.DOT); if (i_index != -1) { throw new IllegalArgumentException("Child name [" + lastPart - + " passed as parameter, may not include [" + ClassicConstants.LOGGER_SEPARATOR + + " passed as parameter, may not include [" + CoreConstants.DOT + "]"); } @@ -251,7 +252,7 @@ public class HLogger extends MarkerIgnoringBase { if (this.isRootLogger()) { childHLogger = new HLogger(lastPart, this); } else { - childHLogger = new HLogger(name + ClassicConstants.LOGGER_SEPARATOR + lastPart, + childHLogger = new HLogger(name + CoreConstants.DOT + lastPart, this); } childrenMap.put(lastPart, childHLogger); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java index 5507ff9..f6350f9 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/LoggerTest.java @@ -134,9 +134,30 @@ public class LoggerTest { assertFalse(logger.isTraceEnabled()); assertFalse(logger.isEnabledFor(Level.TRACE)); } + } + + @Test + public void innerClass_I() { + root.setLevel(Level.DEBUG); + Logger a = lc.getLogger("a"); + a.setLevel(Level.INFO); + Logger a_b = lc.getLogger("a$b"); + assertEquals(Level.INFO, a_b.getEffectiveLevel()); + } + @Test + public void innerClass_II() { + root.setLevel(Level.DEBUG); + Logger a = lc.getLogger(this.getClass()); + a.setLevel(Level.INFO); + Logger a_b = lc.getLogger(new Inner().getClass()); + assertEquals(Level.INFO, a_b.getEffectiveLevel()); } + + class Inner { + } + @Test public void testEnabled_All() throws Exception { root.setLevel(Level.ALL); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java b/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java index 571cdb2..651af43 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/control/ControlLoggerContext.java @@ -18,6 +18,7 @@ import java.util.Map; import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; +import ch.qos.logback.core.CoreConstants; /** * This logger context quite optimized for logger retrieval. @@ -80,7 +81,7 @@ public class ControlLoggerContext { int i = 0; while (true) { - i = name.indexOf(ClassicConstants.LOGGER_SEPARATOR, i); + i = name.indexOf(CoreConstants.DOT, i); if (i == -1) { // System.out.println("FINAL-Creating logger named [" + name + "] with // parent " + parent.getName()); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java b/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java index cf2c734..ead333b 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/control/ScenarioMaker.java @@ -17,6 +17,7 @@ import java.util.LinkedList; import ch.qos.logback.classic.ClassicConstants; import ch.qos.logback.classic.Level; +import ch.qos.logback.core.CoreConstants; public class ScenarioMaker { @@ -76,7 +77,7 @@ public class ScenarioMaker { childName = ScenarioRandomUtil.randomId(); count += childName.length(); } else { - childName = loggerName + ClassicConstants.LOGGER_SEPARATOR + childName = loggerName + CoreConstants.DOT + ScenarioRandomUtil.randomId(); count += childName.length(); } diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 873db19..270ed8d 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -137,6 +137,7 @@ <Export-Package>ch.qos.logback.core.*</Export-Package> <Import-Package> javax.*;resolution:=optional, + org.xml.*;resolution:=optional, org.codehaus.janino;resolution:=optional, * </Import-Package> 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 5258d1b..520c5f4 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 @@ -91,9 +91,12 @@ public class CoreConstants { * Ceki's machine (Orion) */ public static long REFERENCE_BIPS = 9000; + + + static public final char DOT = '.'; - static public final char TAB = '\t'; + static public final char DOLLAR = '$'; static public final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 9d0d4a2..68eb6b0 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -71,6 +71,12 @@ event instead of its own context name. </p> + <p>When a logger is named after an inner class, the '$' is used as + a separator, instead of the usual '.'. This fixes the level + inheritence issue described in <a + href="http://jira.qos.ch/browse/LBCLASSIC-102">LBCLASSIC-102</a> + and as reported by Joern Huxhorn.</p> + <hr width="80%" align="center" /> <h3>9th of August 2009 - Release of version 0.9.17</h3> ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 7 +++- .../ch/qos/logback/classic/ClassicConstants.java | 1 - .../main/java/ch/qos/logback/classic/Logger.java | 32 ++++++++++++++++--- .../java/ch/qos/logback/classic/LoggerContext.java | 2 +- .../classic/pattern/ClassNameOnlyAbbreviator.java | 3 ++ .../TargetLengthBasedClassNameAbbreviator.java | 13 ++++---- .../test/java/ch/qos/logback/classic/HLogger.java | 7 ++-- .../java/ch/qos/logback/classic/LoggerTest.java | 21 +++++++++++++ .../classic/control/ControlLoggerContext.java | 3 +- .../qos/logback/classic/control/ScenarioMaker.java | 3 +- logback-core/pom.xml | 1 + .../java/ch/qos/logback/core/CoreConstants.java | 5 ++- logback-site/src/site/pages/news.html | 6 ++++ 13 files changed, 83 insertions(+), 21 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593
by git-noreply＠pixie.qos.ch 30 Nov '09

30 Nov '09

The branch, master has been updated via f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593 (commit) from a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca (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=f7121aba34e0faef82ca46ea… http://github.com/ceki/logback/commit/f7121aba34e0faef82ca46ea8e2d7b0dfc9bd… commit f7121aba34e0faef82ca46ea8e2d7b0dfc9bd593 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Nov 30 10:09:41 2009 +0100 - added references to new articles in the docs diff --git a/logback-site/src/site/pages/documentation.html b/logback-site/src/site/pages/documentation.html index e426b97..90a9de4 100644 --- a/logback-site/src/site/pages/documentation.html +++ b/logback-site/src/site/pages/documentation.html @@ -83,6 +83,9 @@ up</a>. </li> + <li><a href="http://it-bubbles.wikidot.com/blog:3">Griffon And + org.slf4j (Logback)</a> by Michal Novak</li> + <li><a href="http://www.infoq.com/news/2007/08/logback">Logback: Evolving Java Logging</a> by Geoffrey Wiseman </li> @@ -90,8 +93,17 @@ <li><a href="http://blog.kornr.net/index.php/2008/12/09/understanding-the-osgi-logging-s…">Understanding the OSGI logging service</a> by Nogunner</li> - </ul> + + <h4>In french</h4> + + <ul> + <li><a + href="http://www.insideit.fr/post/2009/11/23/SLF4J-LOGBack">SLF4J + & LOGBack : simplifiez-vous les logs</a> by Ludovic Meurillon + </li> + </ul> + <h2>Conferences</h2> <table cellspacing="20" border="0"> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/documentation.html | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca
by git-noreply＠pixie.qos.ch 28 Nov '09

28 Nov '09

The branch, master has been updated via a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca (commit) from 0908ef4dc8bebd0c8f38dbdd4c2d0282a01d77fb (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=a60e0ea2bd6b90220df2f0d9… http://github.com/ceki/logback/commit/a60e0ea2bd6b90220df2f0d9d5296ca3a25d1… commit a60e0ea2bd6b90220df2f0d9d5296ca3a25d1cca Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sat Nov 28 23:58:39 2009 +0100 - fixed race condition by having the test wait for the compresison thread at least once before the next rollover occurs This is OK, since in production, the rollver period is much much longer than the time it takes to do compression. In our tests however, this reation does not hold. diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java index d152d6d..02cc66a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/SizeAndTimeBasedFNATP.java @@ -36,6 +36,7 @@ public class SizeAndTimeBasedFNATP<E> extends super.start(); archiveRemover = new SizeAndTimeBasedArchiveRemover(tbrp.fileNamePattern, rc); + archiveRemover.setContext(context); // we need to get the correct value of currentPeriodsCounter. // usually the value is 0, unless the appender or the application diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java index 2d3dcd4..1387f12 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java @@ -22,7 +22,9 @@ import java.util.Calendar; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -110,7 +112,6 @@ public class TimeBasedRollingWithArchiveRemovalTest { + "}/clean.txt.zip", MILLIS_IN_MONTH, maxHistory, numPeriods); int beginPeriod = Calendar.getInstance().get(Calendar.MONTH); boolean extraFolder = extraFolder(numPeriods, 12, beginPeriod, maxHistory); - StatusPrinter.print(context); check(expectedCountWithFolders(2, extraFolder)); } @@ -145,9 +146,10 @@ public class TimeBasedRollingWithArchiveRemovalTest { doRollover( randomOutputDir + "/%d{" + DAILY_DATE_PATTERN + "}-clean.%i.zip", MILLIS_IN_DAY, 5, 5 * 4); - + // make .zip optional so that if for one reason or another, no size-based - // rollover occurs on the last period, that the last period is still accounted + // rollover occurs on the last period, that the last period is still + // accounted // for checkPatternCompliance(5 + 1 + slashCount, "\\d{4}-\\d{2}-\\d{2}-clean(\\.\\d)(.zip)?"); @@ -198,12 +200,22 @@ public class TimeBasedRollingWithArchiveRemovalTest { tbrp.timeBasedTriggering.setCurrentTime(addTime(tbrp.timeBasedTriggering .getCurrentTime(), periodDurationInMillis / ticksPerPeriod)); + // wait every now and then for the compression job + // otherwise, we might rollover a file for a given period before a previous + // period's compressor had a chance to run + if(i % (ticksPerPeriod/2) == 0) { + waitForCompression(tbrp); + } } - + waitForCompression(tbrp); + rfa.stop(); + } + + void waitForCompression(TimeBasedRollingPolicy<Object> tbrp) + throws InterruptedException, ExecutionException, TimeoutException { if (tbrp.future != null && !tbrp.future.isDone()) { tbrp.future.get(200, TimeUnit.MILLISECONDS); } - rfa.stop(); } void findAllFoldersRecursively(File dir, List<File> fileList) { @@ -281,7 +293,7 @@ public class TimeBasedRollingWithArchiveRemovalTest { // year is 2012, and not 2013 (the current year). boolean extraFolder(int numPeriods, int periodsPerEra, int beginPeriod, int maxHistory) { - int adjustedBegin = beginPeriod+1; + int adjustedBegin = beginPeriod + 1; int remainder = ((adjustedBegin) + numPeriods) % periodsPerEra; return (remainder < maxHistory + 1); } ----------------------------------------------------------------------- Summary of changes: .../core/rolling/SizeAndTimeBasedFNATP.java | 1 + .../TimeBasedRollingWithArchiveRemovalTest.java | 24 +++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

branch, master, updated. 0908ef4dc8bebd0c8f38dbdd4c2d0282a01d77fb
by git-noreply＠pixie.qos.ch 28 Nov '09

28 Nov '09

The branch, master has been updated via 0908ef4dc8bebd0c8f38dbdd4c2d0282a01d77fb (commit) from 843489d8a2aefa978f32c6ad9b9ed1596ec113c8 (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=0908ef4dc8bebd0c8f38dbdd… http://github.com/ceki/logback/commit/0908ef4dc8bebd0c8f38dbdd4c2d0282a01d7… commit 0908ef4dc8bebd0c8f38dbdd4c2d0282a01d77fb Author: Ceki Gulcu <ceki(a)qos.ch> Date: Sat Nov 28 23:36:03 2009 +0100 - Partial fix to LBGENERAL-35 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 6ad9bd7..ef19d9d 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 @@ -32,6 +32,7 @@ public class DefaultTimeBasedFileNamingAndTriggeringPolicy<E> extends TimeBasedF public void start() { super.start(); archiveRemover = new DefaultArchiveRemover(tbrp.fileNamePattern, rc); + archiveRemover.setContext(context); started = true; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/ArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/ArchiveRemover.java index 53cf5f7..a8b5c10 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/ArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/ArchiveRemover.java @@ -15,12 +15,14 @@ package ch.qos.logback.core.rolling.helper; import java.util.Date; +import ch.qos.logback.core.spi.ContextAware; + /** * Given a date remove older archived log files. * * @author Ceki Gülcü */ -public interface ArchiveRemover { +public interface ArchiveRemover extends ContextAware { public void clean(Date now); public void setMaxHistory(int maxHistory); } \ No newline at end of file diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java index c18b53c..32e7e56 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/DefaultArchiveRemover.java @@ -18,8 +18,10 @@ import java.util.Date; import ch.qos.logback.core.pattern.Converter; import ch.qos.logback.core.pattern.LiteralConverter; +import ch.qos.logback.core.spi.ContextAwareBase; -public class DefaultArchiveRemover implements ArchiveRemover { +public class DefaultArchiveRemover extends ContextAwareBase implements + ArchiveRemover { final FileNamePattern fileNamePattern; final RollingCalendar rc; @@ -36,32 +38,33 @@ public class DefaultArchiveRemover implements ArchiveRemover { boolean computeParentCleaningFlag(FileNamePattern fileNamePattern) { DateTokenConverter dtc = fileNamePattern.getDateTokenConverter(); // if the date pattern has a /, then we need parent cleaning - if(dtc.getDatePattern().indexOf('/') != -1) { + if (dtc.getDatePattern().indexOf('/') != -1) { return true; } - // if the literal string subsequent to the dtc contains a /, we also need + // if the literal string subsequent to the dtc contains a /, we also + // need // parent cleaning - + Converter<Object> p = fileNamePattern.headTokenConverter; - + // find the date converter - while(p != null) { - if(p instanceof DateTokenConverter) { + while (p != null) { + if (p instanceof DateTokenConverter) { break; } p = p.getNext(); } - - while(p != null) { - if(p instanceof LiteralConverter) { + + while (p != null) { + if (p instanceof LiteralConverter) { String s = p.convert(null); - if(s.indexOf('/') != -1) { + if (s.indexOf('/') != -1) { return true; } } p = p.getNext(); } - + // no /, so we don't need parent cleaning return false; } @@ -72,6 +75,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { File file2Delete = new File(filename); if (file2Delete.exists() && file2Delete.isFile()) { file2Delete.delete(); + addInfo("deleting " + file2Delete); if (parentClean) { removeFolderIfEmpty(file2Delete.getParentFile(), 0); } @@ -92,6 +96,7 @@ public class DefaultArchiveRemover implements ArchiveRemover { return; } if (dir.isDirectory() && FileFilterUtil.isEmptyDirectory(dir)) { + addInfo("deleting folder [" + dir +"]"); dir.delete(); removeFolderIfEmpty(dir.getParentFile(), recursivityCount + 1); } diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java index 4d1d697..2d3dcd4 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedRollingWithArchiveRemovalTest.java @@ -35,6 +35,7 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.layout.EchoLayout; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; +import ch.qos.logback.core.util.StatusPrinter; public class TimeBasedRollingWithArchiveRemovalTest { @@ -109,6 +110,7 @@ public class TimeBasedRollingWithArchiveRemovalTest { + "}/clean.txt.zip", MILLIS_IN_MONTH, maxHistory, numPeriods); int beginPeriod = Calendar.getInstance().get(Calendar.MONTH); boolean extraFolder = extraFolder(numPeriods, 12, beginPeriod, maxHistory); + StatusPrinter.print(context); check(expectedCountWithFolders(2, extraFolder)); } @@ -279,7 +281,8 @@ public class TimeBasedRollingWithArchiveRemovalTest { // year is 2012, and not 2013 (the current year). boolean extraFolder(int numPeriods, int periodsPerEra, int beginPeriod, int maxHistory) { - int remainder = (beginPeriod + numPeriods) % periodsPerEra; + int adjustedBegin = beginPeriod+1; + int remainder = ((adjustedBegin) + numPeriods) % periodsPerEra; return (remainder < maxHistory + 1); } ----------------------------------------------------------------------- Summary of changes: ...aultTimeBasedFileNamingAndTriggeringPolicy.java | 1 + .../core/rolling/helper/ArchiveRemover.java | 4 ++- .../core/rolling/helper/DefaultArchiveRemover.java | 29 +++++++++++-------- .../TimeBasedRollingWithArchiveRemovalTest.java | 5 +++- 4 files changed, 25 insertions(+), 14 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

WriterAppender.subAppend behaviour in case of IOExceptions
by Syvalta 27 Nov '09

27 Nov '09

Hi, I noticed WriterAppender.subAppend stops appending if an IOException occurs during write. This is bit problematic if interruption is used as a cancellation mechanism (as suggested in JCiP). The problem is that if a thread happens to be logging at the time it is interrupted, logging (for that appender) will be ceased for the lifetime of the application (or until Logback is re-initialized). Additionally, if there are some transient errors, logging won't continue after recovery. At least it seems so, but I might be wrong. I could provide a patch which changes the behavior, but it seems changes are non-trivial. I would be glad to receive some advice. - how backward compatible the changes should be? Can I remove methods, add abstract methods etc. or should backward compatibility be preserved (and if it is, does that increase the likelihood of the patch being applied)? - in what level at hierarchy this should be done? I have thought at WriterAppender, but that would require adding a method to create OutputStream, which subclasses would implement. Currently subclasses set writer to WriterAppender, so this would change it to the opposite. Another option would be to do it at FileAppender level, but I haven't investigated that option much yet. - should there be some "throttling", so that under persistent error state new outputstream would not be tried to be created in every logging call. I think so, perhaps some condition like "try in first 10 calls, but after that only every 30 sec). - should the log events be buffered under presence of error (of course limited amount with fifo or something)? - is there any chance that this kind of patch would be accepted? Do you see this kind of feature useful? Hope you understand at least something from my post, I admit it is "bit" unclear :) -- View this message in context: http://www.nabble.com/WriterAppender.subAppend-behaviour-in-case-of-IOExcep… Sent from the Logback Dev mailing list archive at Nabble.com.

2 2

branch, master, updated. 843489d8a2aefa978f32c6ad9b9ed1596ec113c8
by git-noreply＠pixie.qos.ch 25 Nov '09

25 Nov '09

The branch, master has been updated via 843489d8a2aefa978f32c6ad9b9ed1596ec113c8 (commit) from a0e45a889c6180b29f853348ccbdf2eacca1bb55 (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=843489d8a2aefa978f32c6ad… http://github.com/ceki/logback/commit/843489d8a2aefa978f32c6ad9b9ed1596ec11… commit 843489d8a2aefa978f32c6ad9b9ed1596ec113c8 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Nov 25 22:00:11 2009 +0100 - fixed LBCLASSIC-121 by applying Hugues' patch provided in LBCLASSIC-168. diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index b460fb3..286d0e6 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -215,7 +215,7 @@ of java code. --> <Import-Package> - sun.reflect;resolution:=optional, javax.jms;resolution:=optional, + sun.reflect;resolution:=optional, javax.*;resolution:=optional, ch.qos.logback.core.rolling, ch.qos.logback.core.rolling.helper, * </Import-Package> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 95af9a3..9d0d4a2 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -39,7 +39,9 @@ <p>Fixed Private-Package and Export-Package sections in logback-classic.jar MANIFEST as reported in <a href="http://jira.qos.ch/browse/LBCLASSIC-165">LBCLASSIC-165</a> - by applying the relavant patch supplied by Hugues Malphettes. + and <a + href="http://jira.qos.ch/browse/LBCLASSIC-121">LBCLASSIC-121</a> + by applying the relavant patches supplied by Hugues Malphettes. </p> <p>Made the OSGi import declerations for Janino and javax optional ----------------------------------------------------------------------- Summary of changes: logback-classic/pom.xml | 2 +- logback-site/src/site/pages/news.html | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0