December 2009 - logback-dev

[JIRA] Created: (LBCORE-119) ReconfigureOnChangeFilter doesn't pick up changes if there are spaces in the filename
by Anders Wallgren (JIRA) 01 Dec '09

01 Dec '09

ReconfigureOnChangeFilter doesn't pick up changes if there are spaces in the filename ------------------------------------------------------------------------------------- Key: LBCORE-119 URL: http://jira.qos.ch/browse/LBCORE-119 Project: logback-core Issue Type: Bug Affects Versions: 0.9.17 Reporter: Anders Wallgren Assignee: Logback dev list ReconfigureOnChangeFilter.start doesn't unencode the URL encoding of spaces, so it will never detect changes since the url-encoded filename doesn't exist. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 7

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