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 bfe8b7f3b44493325020de0d6b852a38be9b4053 (commit) via 45879248ca1dad7b0d5894339c86dc7f530b722e (commit) from d9c06c3183b09d38394fd0dc3faef226da6b29fe (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=bfe8b7f3b44493325020de0d6... http://github.com/ceki/logback/commit/bfe8b7f3b44493325020de0d6b852a38be9b40... commit bfe8b7f3b44493325020de0d6b852a38be9b4053 Merge: 4587924 d9c06c3 Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Mar 5 18:04:13 2012 +0100 Merge branch 'master' of git.qos.ch:logback http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=45879248ca1dad7b0d5894339... http://github.com/ceki/logback/commit/45879248ca1dad7b0d5894339c86dc7f530b72... commit 45879248ca1dad7b0d5894339c86dc7f530b722e Author: Ceki Gulcu <ceki@qos.ch> Date: Mon Mar 5 18:02:47 2012 +0100 auxiliary %d tokens are marked as such with 'aux' diff --git a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java index 7d574a4..500a0ae 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/rolling/TimeBasedFileNamingAndTriggeringPolicyBaseTest.java @@ -49,11 +49,14 @@ public class TimeBasedFileNamingAndTriggeringPolicyBaseTest { assertEquals("foo-2011-12T59.log", elapsedPeriodsFileName); } -@Test + // see "log rollover should be configurable using %d multiple times in file name pattern" + // http://jira.qos.ch/browse/LBCORE-242 + + @Test public void multiDate() { // Tuesday December 20th 17:59:01 CET 2011 long startTime = 1324400341553L; - tbrp.setFileNamePattern("foo-%d{yyyy-MM, SECONDARY}/%d{mm}.log"); + tbrp.setFileNamePattern("foo-%d{yyyy-MM, AUX}/%d{mm}.log"); tbrp.start(); timeBasedFNATP.setCurrentTime(startTime); diff --git a/logback-site/src/site/pages/manual/layouts.html b/logback-site/src/site/pages/manual/layouts.html index 34e9b6b..823795e 100644 --- a/logback-site/src/site/pages/manual/layouts.html +++ b/logback-site/src/site/pages/manual/layouts.html @@ -587,15 +587,14 @@ WARN [main]: Message 2</p> city. </p> - <p>Given that the comma ',' character is the option - separator, the pattern string [HH:mm:ss,SSS] will print the - time in the [SSS] time zone which does not exist. Thus, the - time will be printed in the default GMT timezone. If you - wish to include a comma in your date pattern, then simply - enclose the pattern between quotes. For example, - %date{<b>"</b>HH:mm:ss,SSS<b>"</b>}. + <p>Given that the comma ',' character is interpreted as the + option separator, the pattern string [HH:mm:ss,SSS] will + print the time in the [SSS] time zone which does not + exist. Thus, the time will be printed in the default GMT + timezone. If you wish to include a comma in your date + pattern, then simply enclose the pattern between quotes. For + example, %date{<b>"</b>HH:mm:ss,SSS<b>"</b>}. </p> - </td> </tr> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 5a399c7..5e654c8 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -41,10 +41,13 @@ reported by Bruce E. Irving. </p> - <p>It is now possible to specify multiple %d token in the file - name pattern of TimeBasedRollingPolicy. This feature was requested - in <a href="http://jira.qos.ch/browse/LBCORE-242">/LBCORE-242</a> - by Thomas Corte.</p> + <p>It is now possible to specify multiple %d tokens in the file + name pattern of <a + href="manual/appenders.html#TimeBasedRollingPolicy">TimeBasedRollingPolicy</a>. Auxiliary + %d tokens must be marked as such by passing the AUX + paramater. This feature was requested in <a + href="http://jira.qos.ch/browse/LBCORE-242">LBCORE-242</a> by + Thomas Corte.</p> <p>Logback now supports suppressed exceptions introduced in Java 7. This fixes <a ----------------------------------------------------------------------- Summary of changes: ...BasedFileNamingAndTriggeringPolicyBaseTest.java | 7 +++++-- logback-site/src/site/pages/manual/layouts.html | 15 +++++++-------- logback-site/src/site/pages/news.html | 11 +++++++---- 3 files changed, 19 insertions(+), 14 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.