
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 369b71c9c28d38dd45af49925d88d4853fb6679a (commit) from e1750a116b652ae912d9da35c22de07947762f05 (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=369b71c9c28d38dd45af49925... http://github.com/ceki/logback/commit/369b71c9c28d38dd45af49925d88d4853fb667... commit 369b71c9c28d38dd45af49925d88d4853fb6679a Author: Ceki Gulcu <ceki@qos.ch> Date: Thu Apr 26 09:54:38 2012 +0200 have tests pass 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 741bf88..08869c3 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 @@ -125,7 +125,7 @@ public class ReconfigureOnChangeFilter extends TurboFilter { // for CPU intensive applications with 200 or more threads MASK values in the order of 0xFFFF is appropriate private static final int MAX_MASK = 0xFFFF; - // update the mask so as to execute change detection code about once every 1s. + // update the mask so as to execute change detection code about once every 1 to 8 seconds. private void updateMaskIfNecessary(long now) { // if less than 1s elapsed since last maskUpdate double the mask size and add 1 final long timeElapsedSinceLastCheck = now - lastMaskCheck; diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java index 115bd6c..4eb7c18 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/helper/FileNamePatternTest.java @@ -115,13 +115,13 @@ public class FileNamePatternTest { FileNamePattern fnp = new FileNamePattern("foo-%d{yyyy.MM.dd}-%i.txt", context); String regex = fnp.toRegex(cal.getTime()); - assertEquals("foo-2003.05.20-(\\d{1,2}).txt", regex); + assertEquals("foo-2003.05.20-(\\d{1,3}).txt", regex); } { FileNamePattern fnp = new FileNamePattern("\\toto\\foo-%d{yyyy\\MM\\dd}-%i.txt", context); String regex = fnp.toRegex(cal.getTime()); - assertEquals("/toto/foo-2003/05/20-(\\d{1,2}).txt", regex); + assertEquals("/toto/foo-2003/05/20-(\\d{1,3}).txt", regex); } } ----------------------------------------------------------------------- Summary of changes: .../classic/turbo/ReconfigureOnChangeFilter.java | 2 +- .../core/rolling/helper/FileNamePatternTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.