October 2010 - logback-dev - mailman3.qos.ch

[JIRA] Created: (LBCORE-164) SizeAndTimeBasedFNATP will overwrite previous logging files with index > 9 on restart app.
by Dieter Mueller (JIRA) 13 Oct '10

13 Oct '10

SizeAndTimeBasedFNATP will overwrite previous logging files with index > 9 on restart app. ------------------------------------------------------------------------------------------ Key: LBCORE-164 URL: http://jira.qos.ch/browse/LBCORE-164 Project: logback-core Issue Type: Bug Components: Rolling Affects Versions: 0.9.24 Environment: Windows XP, java jdk1.6.0_18 Reporter: Dieter Mueller Assignee: Logback dev list Configuration: <appender name="DebugLog" class="ch.qos.logback.core.rolling.RollingFileAppender">  <file>c:/log/debug.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  <fileNamePattern>c:/log/debug-old-%d{yyyy-MM-dd}.%i.log</fileNamePattern> <maxHistory>3</maxHistory> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> <maxFileSize>10KB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> </rollingPolicy> <encoder> <pattern>%date{ISO8601} %-5level [%thread] %logger{30}:%line - %msg%n</pattern> </encoder> </appender> Steps to reproduce: 1. Start the application 2. debug.log was created. 3. let run, until periodscounter reaches 10 or more (or prepare the files), e.g. c:\log\debug-old-2010-08-10.0.log c:\log\debug-old-2010-08-10.1.log c:\log\debug-old-2010-08-10.10.log c:\log\debug-old-2010-08-10.11.log c:\log\debug-old-2010-08-10.12.log c:\log\debug-old-2010-08-10.2.log c:\log\debug-old-2010-08-10.3.log c:\log\debug-old-2010-08-10.4.log c:\log\debug-old-2010-08-10.5.log c:\log\debug-old-2010-08-10.6.log c:\log\debug-old-2010-08-10.7.log c:\log\debug-old-2010-08-10.8.log c:\log\debug-old-2010-08-10.9.log 4. restart the application 5. log to base.log 6. yyyy-MM-dd.10.log was (re-)created on rollover, overwrite the previous yyyy-MM-dd.10.log. Logging messages are lost. It looks like the root cause is the (reversed) sorting via filenames in method ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP.computeCurrentPeriodsHighestCounterValue(String) FileFilterUtil.reverseSortFileArrayByName(matchingFileArray); currentPeriodsCounter = FileFilterUtil.extractCounter(matchingFileArray[0], stemRegex); because the input file array looks like: c:\log\debug-old-2010-08-10.0.log c:\log\debug-old-2010-08-10.1.log c:\log\debug-old-2010-08-10.10.log c:\log\debug-old-2010-08-10.11.log c:\log\debug-old-2010-08-10.12.log c:\log\debug-old-2010-08-10.2.log c:\log\debug-old-2010-08-10.3.log c:\log\debug-old-2010-08-10.4.log c:\log\debug-old-2010-08-10.5.log c:\log\debug-old-2010-08-10.6.log c:\log\debug-old-2010-08-10.7.log c:\log\debug-old-2010-08-10.8.log c:\log\debug-old-2010-08-10.9.log and in reversed order: c:\log\debug-old-2010-08-10.9.log c:\log\debug-old-2010-08-10.8.log c:\log\debug-old-2010-08-10.7.log c:\log\debug-old-2010-08-10.6.log c:\log\debug-old-2010-08-10.5.log c:\log\debug-old-2010-08-10.4.log c:\log\debug-old-2010-08-10.3.log c:\log\debug-old-2010-08-10.2.log c:\log\debug-old-2010-08-10.12.log c:\log\debug-old-2010-08-10.11.log c:\log\debug-old-2010-08-10.10.log c:\log\debug-old-2010-08-10.1.log c:\log\debug-old-2010-08-10.0.log then the wrong index 9 of the first file is used! Suggestion for solution: Get all indizes and use the highest. for example: void computeCurrentPeriodsHighestCounterValue(final String stemRegex) { File file = new File(getCurrentPeriodsFileNameWithoutCompressionSuffix()); File parentDir = file.getParentFile(); File[] matchingFileArray = FileFilterUtil .filesInFolderMatchingStemRegex(parentDir, stemRegex); if (matchingFileArray == null || matchingFileArray.length == 0) { currentPeriodsCounter = 0; return; } // FileFilterUtil.reverseSortFileArrayByName(matchingFileArray); // currentPeriodsCounter = FileFilterUtil.extractCounter(matchingFileArray[0], stemRegex); for (File logFile : matchingFileArray) { int aPeriodCounter = FileFilterUtil.extractCounter(logFile, stemRegex); if (aPeriodCounter > currentPeriodsCounter) { currentPeriodsCounter = aPeriodCounter; } } if (tbrp.getParentsRawFileProperty() != null) { currentPeriodsCounter++; } } -- 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 2

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.24-31-gb5c7149
by git-noreply＠pixie.qos.ch 13 Oct '10

13 Oct '10

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 b5c7149857fa174693a8f21788174329afd123ab (commit) from eb27832f17a90b2cb5e27631e8bcec619c573238 (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=b5c7149857fa174693a8f217… http://github.com/ceki/logback/commit/b5c7149857fa174693a8f21788174329afd12… commit b5c7149857fa174693a8f21788174329afd123ab Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 13 23:23:16 2010 +0200 fixed LBCORE-16 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 a1916b1..84585f1 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 @@ -61,8 +61,7 @@ public class SizeAndTimeBasedFNATP<E> extends currentPeriodsCounter = 0; return; } - FileFilterUtil.reverseSortFileArrayByName(matchingFileArray); - currentPeriodsCounter = FileFilterUtil.extractCounter(matchingFileArray[0], stemRegex); + currentPeriodsCounter = FileFilterUtil.findHighestCounter(matchingFileArray, stemRegex); if (tbrp.getParentsRawFileProperty() != null) { currentPeriodsCounter++; } @@ -92,8 +91,8 @@ public class SizeAndTimeBasedFNATP<E> extends if (((++invocationCounter) & invocationMask) != invocationMask) { return false; } - if (invocationMask < 0x0F) { - invocationMask = (invocationMask << 1) + 1 ; + if (invocationMask < 0x0F) { + invocationMask = (invocationMask << 1) + 1; } if (activeFile.length() >= maxFileSize.getSize()) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java index 1faea62..0de8e95 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/helper/FileFilterUtil.java @@ -88,6 +88,16 @@ public class FileFilterUtil { return matchingFileArray; } + static public int findHighestCounter(File[] matchingFileArray, final String stemRegex) { + int max = Integer.MIN_VALUE; + for (File aFile : matchingFileArray) { + int aCounter = FileFilterUtil.extractCounter(aFile, stemRegex); + if (max < aCounter) + max = aCounter; + } + return max; + } + static public int extractCounter(File file, final String stemRegex) { Pattern p = Pattern.compile(stemRegex); String lastFileName = file.getName(); diff --git a/logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java b/logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java new file mode 100644 index 0000000..a385d5a --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java @@ -0,0 +1,58 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.core.helpers; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.rolling.helper.FileFilterUtil; +import ch.qos.logback.core.rolling.helper.FileNamePattern; +import org.junit.Test; + +import java.io.File; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import static junit.framework.Assert.assertEquals; + +public class FileFilterUtilTest { + + + Context context = new ContextBase(); + + // see also http://jira.qos.ch/browse/LBCORE-164 + @Test + public void findHighestCounterTest() throws ParseException { + String[] sa = new String[]{"c:/log/debug-old-2010-08-10.0.log", + "c:/log/debug-old-2010-08-10.1.log", "c:/log/debug-old-2010-08-10.10.log", + "c:/log/debug-old-2010-08-10.11.log", "c:/log/debug-old-2010-08-10.12.log", + "c:/log/debug-old-2010-08-10.2.log", "c:/log/debug-old-2010-08-10.3.log", + "c:/log/debug-old-2010-08-10.4.log", "c:/log/debug-old-2010-08-10.5.log", + "c:/log/debug-old-2010-08-10.6.log", "c:/log/debug-old-2010-08-10.7.log", + "c:/log/debug-old-2010-08-10.8.log", "c:/log/debug-old-2010-08-10.9.log"}; + + File[] matchingFileArray = new File[sa.length]; + for (int i = 0; i < sa.length; i++) { + matchingFileArray[i] = new File(sa[i]); + } + FileNamePattern fnp = new FileNamePattern("c:/log/debug-old-%d{yyyy-MM-dd}.%i.log", context); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String rexexp = null; + rexexp = fnp.toRegex(sdf.parse("2010-08-10")); + String stemRegex = FileFilterUtil.afterLastSlash(rexexp); + int result = FileFilterUtil.findHighestCounter(matchingFileArray, stemRegex); + assertEquals(12, result); + } +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java index f840c78..192acf5 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/helpers/PackageTest.java @@ -13,12 +13,13 @@ */ package ch.qos.logback.core.helpers; +import ch.qos.logback.core.util.FileUtilTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -(a)SuiteClasses({ThrowableToStringArrayTest.class}) +(a)SuiteClasses({ThrowableToStringArrayTest.class, FileUtilTest.class}) public class PackageTest { } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 46a126c..5e4e61e 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -46,6 +46,14 @@ as reported by David Harrigan. </p> + <p>As reported in <a + href="http://jira.qos.ch/browse/LBCORE-164">LBCORE-164</a>, + <code>SizeAndTimeBasedFNATP</code> would cause previous logging + files with indexes over nine to be overwitten on application + restart. This complex bug was reported and precisely diagnosed by + Dieter Mueller. He has also proposed a fix which was subsequently + adopted as is.</p> + <hr width="80%" align="center" /> <h3>June 30th, 2010 - Release of version 0.9.24</h3> ----------------------------------------------------------------------- Summary of changes: .../core/rolling/SizeAndTimeBasedFNATP.java | 7 +-- .../core/rolling/helper/FileFilterUtil.java | 10 ++++ .../logback/core/helpers/FileFilterUtilTest.java | 58 ++++++++++++++++++++ .../ch/qos/logback/core/helpers/PackageTest.java | 3 +- logback-site/src/site/pages/news.html | 8 +++ 5 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 logback-core/src/test/java/ch/qos/logback/core/helpers/FileFilterUtilTest.java 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.24-30-geb27832
by git-noreply＠pixie.qos.ch 13 Oct '10

13 Oct '10

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 eb27832f17a90b2cb5e27631e8bcec619c573238 (commit) from f0ffd80fe1f4230a9d7fa2d21b64f49738e73a9d (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=eb27832f17a90b2cb5e27631… http://github.com/ceki/logback/commit/eb27832f17a90b2cb5e27631e8bcec619c573… commit eb27832f17a90b2cb5e27631e8bcec619c573238 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 13 22:28:05 2010 +0200 - In NestedComplexPropertyIA stopped writing about objects being pushed onto the stack - In configuration.html added extra blurb linking to status listeners diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java index 2f942c2..f012d5f 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/NestedComplexPropertyIA.java @@ -126,9 +126,8 @@ public class NestedComplexPropertyIA extends ImplicitAction { ((ContextAware) actionData.getNestedComplexProperty()) .setContext(this.context); } - // getLogger().debug( - addInfo("Pushing component [" + localName - + "] on top of the object stack."); + //addInfo("Pushing component [" + localName + // + "] on top of the object stack."); ec.pushObject(actionData.getNestedComplexProperty()); } catch (Exception oops) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java b/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java index 034c720..7fb2385 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java +++ b/logback-core/src/main/java/ch/qos/logback/core/rolling/FixedWindowRollingPolicy.java @@ -99,6 +99,7 @@ public class FixedWindowRollingPolicy extends RollingPolicyBase { } public void rollover() throws RolloverFailure { + // Inside this method it is guaranteed that the hereto active log file is // closed. // If maxIndex <= 0, then there is no file renaming to be done. diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 0d70252..1f40973 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -378,6 +378,12 @@ public class Foo { printed. </p> + <p>It is highly recommended to register a status listener, + e.g. <code>OnConsoleStatusListener</code>, so that problems + occuring during the lifetime of your applicaiton, well after + logback is initialized, can be reported. See the section on <a + href="#statusListener">status listeners</a> further below.</p> + <h3><a name="configFileProperty" href="#configFileProperty">Specifying the location of the default configuration file as a system property</a></h3> @@ -614,7 +620,9 @@ public class MyApp3 { <p>Note that the registered status listener will receive status events subsequent to its registration. It will not receive prior - messages.</p> + messages. Thus, it is usually a good idea to place status listener + registration directives at top of the configuration file before + other directives.</p> <p>It is also possible to register one or more status listeners within a configuration file. Here is an example.</p> ----------------------------------------------------------------------- Summary of changes: .../core/joran/action/NestedComplexPropertyIA.java | 5 ++--- .../core/rolling/FixedWindowRollingPolicy.java | 1 + .../src/site/pages/manual/configuration.html | 10 +++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-216) java.lang.NullPointerException in ThrowableProxyUtil.java:42
by Luciano Canè (JIRA) 13 Oct '10

13 Oct '10

java.lang.NullPointerException in ThrowableProxyUtil.java:42 ------------------------------------------------------------ Key: LBCLASSIC-216 URL: http://jira.qos.ch/browse/LBCLASSIC-216 Project: logback-classic Issue Type: Bug Components: Other Affects Versions: 0.9.24 Environment: IDE WebSphere 6.1 , IBM JDK 1.5 Reporter: Luciano Canè Assignee: Logback dev list {code:title=test example} import org.slf4j.LoggerFactory; public class TestLogBack { public TestLogBack() { super(); } public static void main(String[] args) { TestLogBack test = new TestLogBack(); test.execute(); } private void execute() { org.slf4j.Logger logger = LoggerFactory.getLogger(TestLogBack.class); //test try { throw new TestLogBackException("Test: getStackTrace() return null"); //$NON-NLS-1$ } catch (Throwable t) { logger.error("Messaggio di Test di {}", t.getMessage(), t); //$NON-NLS-1$ } } class TestLogBackException extends Exception { private static final long serialVersionUID = 1L; public TestLogBackException(String message) { super(message); } @Override public StackTraceElement[] getStackTrace() { return null; } } } {code} {code:title=exception stack trace} Exception in thread "main" java.lang.NullPointerException at ch.qos.logback.classic.spi.ThrowableProxyUtil.steArrayToStepArray(ThrowableProxyUtil.java:42) at ch.qos.logback.classic.spi.ThrowableProxy.<init>(ThrowableProxy.java:35) at ch.qos.logback.classic.spi.LoggingEvent.<init>(LoggingEvent.java:123) at ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:469) at ch.qos.logback.classic.Logger.filterAndLog_2(Logger.java:462) at ch.qos.logback.classic.Logger.error(Logger.java:580) at z_prove.logback.TestLogBack.execute(TestLogBack.java:28) at z_prove.logback.TestLogBack.main(TestLogBack.java:13) {code} -- 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

3 7

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.24-29-gf0ffd80
by git-noreply＠pixie.qos.ch 13 Oct '10

13 Oct '10

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 f0ffd80fe1f4230a9d7fa2d21b64f49738e73a9d (commit) from 7480e3375fa4b7e22c3c5a96bf56867b48ce46bc (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=f0ffd80fe1f4230a9d7fa2d2… http://github.com/ceki/logback/commit/f0ffd80fe1f4230a9d7fa2d21b64f49738e73… commit f0ffd80fe1f4230a9d7fa2d21b64f49738e73a9d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 13 20:51:14 2010 +0200 fixed LBCLASSIC-216 diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java index be8dc67..964ca59 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java @@ -39,6 +39,9 @@ public class ThrowableProxyUtil { } static StackTraceElementProxy[] steArrayToStepArray(StackTraceElement[] stea) { + if(stea == null) { + return new StackTraceElementProxy[0]; + } StackTraceElementProxy[] stepa = new StackTraceElementProxy[stea.length]; for (int i = 0; i < stepa.length; i++) { stepa[i] = new StackTraceElementProxy(stea[i]); @@ -48,7 +51,7 @@ public class ThrowableProxyUtil { static int findNumberOfCommonFrames(StackTraceElement[] steArray, StackTraceElementProxy[] parentSTEPArray) { - if (parentSTEPArray == null) { + if (parentSTEPArray == null || steArray == null) { return 0; } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/ThrowableProxyTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/ThrowableProxyTest.java index d0fc89e..ea39a8b 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/ThrowableProxyTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/ThrowableProxyTest.java @@ -39,12 +39,12 @@ public class ThrowableProxyTest { t.printStackTrace(pw); IThrowableProxy tp = new ThrowableProxy(t); - + String result = ThrowableProxyUtil.asString(tp); result = result.replace("common frames omitted", "more"); - + String expected = sw.toString(); - + System.out.println("========expected"); System.out.println(expected); @@ -71,6 +71,26 @@ public class ThrowableProxyTest { verify(w); } + // see also http://jira.qos.ch/browse/LBCLASSIC-216 + @Test + public void nullSTE() { + Throwable t = new Exception("someMethodWithNullException") { + @Override + public StackTraceElement[] getStackTrace() { + return null; + } + }; + // we can't test output as Throwable.printStackTrace method uses + // the private getOurStackTrace method instead of getStackTrace + + // tests ThrowableProxyUtil.steArrayToStepArray + new ThrowableProxy(t); + + // tests ThrowableProxyUtil.findNumberOfCommonFrames + Exception top = new Exception("top", t); + new ThrowableProxy(top); + } + @Test public void multiNested() { Exception w = null; @@ -86,6 +106,15 @@ public class ThrowableProxyTest { throw new Exception("someMethod"); } + void someMethodWithNullException() throws Exception { + throw new Exception("someMethodWithNullException") { + @Override + public StackTraceElement[] getStackTrace() { + return null; + } + }; + } + void someOtherMethod() throws Exception { try { someMethod(); diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 63a3e51..46a126c 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -44,6 +44,7 @@ <a href="manual/configuration.html#variableSubstitution">variable substitution</a>, thus fixing <a href="http://jira.qos.ch/browse/LBCLASSIC-224">LBCLASSIC-224</a> as reported by David Harrigan. + </p> <hr width="80%" align="center" /> ----------------------------------------------------------------------- Summary of changes: .../logback/classic/spi/ThrowableProxyUtil.java | 5 ++- .../logback/classic/spi/ThrowableProxyTest.java | 35 ++++++++++++++++++-- logback-site/src/site/pages/news.html | 1 + 3 files changed, 37 insertions(+), 4 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-154) Use of default values in appender-refs
by David Harrigan (JIRA) 13 Oct '10

13 Oct '10

Use of default values in appender-refs -------------------------------------- Key: LBCORE-154 URL: http://jira.qos.ch/browse/LBCORE-154 Project: logback-core Issue Type: Improvement Components: Appender Environment: All Reporter: David Harrigan Assignee: Logback dev list This is referenced also here: http://old.nabble.com/Appender-Ref-Default-Value-to28605941.html Please can we have the ability to specify default values for appender-refs. I have a use case where we need to "bake-in" the appender during build-time. I can do this at the moment for logger level by bringing in a property file (called override.properties) that can reset the logging level (which is dependent on the deployment environment and other factors). Here is a little example: <property resource="override.properties" /> <logger name="bar.foo" level="${bar.foo.log.level:-info}" additivity="false"> <appender-ref ref="console"/> </logger> The bar.foo.log.level is defined in the override.properties file. The correct file gets inserted for each build type. I would like to do the following as well: <logger name="bar.foo" level="${bar.foo.log.level:-info}" additivity="false"> <appender-ref ref="${bar.foo.log.appender:-console}"/> </logger> So that I can tell the override where to log to (console for development or log file, or smtp, or jms, or db for other environments). This would be so neato if implemented :-) Thank you. -=david=- -- 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 8

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.24-28-g7480e33
by git-noreply＠pixie.qos.ch 13 Oct '10

13 Oct '10

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 7480e3375fa4b7e22c3c5a96bf56867b48ce46bc (commit) from e519c39a35da84d83a8c5121490551473d6f92fa (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=7480e3375fa4b7e22c3c5a96… http://github.com/ceki/logback/commit/7480e3375fa4b7e22c3c5a96bf56867b48ce4… commit 7480e3375fa4b7e22c3c5a96bf56867b48ce46bc Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 13 19:48:54 2010 +0200 fixing LBCLASSIC-224 diff --git a/logback-classic/src/test/input/joran/appenderRefByProperty.xml b/logback-classic/src/test/input/joran/appenderRefByProperty.xml new file mode 100644 index 0000000..8e9d0b9 --- /dev/null +++ b/logback-classic/src/test/input/joran/appenderRefByProperty.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="false"> + + <appender name="A" class="ch.qos.logback.core.read.ListAppender"/> + <appender name="B" class="ch.qos.logback.core.read.ListAppender"/> + + <logger name="ch.qos.logback.classic.joran" level="INFO"> + <appender-ref ref="${logback.appenderRef}"/> + </logger> + + <root level="ERROR"> + <appender-ref ref="LIST"/> + </root> + +</configuration> 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 8f82d6c..5cebca1 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 @@ -85,7 +85,7 @@ public class JoranConfiguratorTest { System.setProperty(propertyName, "INFO"); configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "rootLevelByProperty.xml"); + + "rootLevelByProperty.xml"); // StatusPrinter.print(loggerContext); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); @@ -101,7 +101,7 @@ public class JoranConfiguratorTest { System.setProperty(propertyName, "DEBUG"); configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "loggerLevelByProperty.xml"); + + "loggerLevelByProperty.xml"); // StatusPrinter.print(loggerContext); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); @@ -112,6 +112,22 @@ public class JoranConfiguratorTest { } @Test + public void appenderRefSettingBySystemProperty() throws JoranException { + final String propertyName = "logback.appenderRef"; + System.setProperty(propertyName, "A"); + configure(ClassicTestConstants.JORAN_INPUT_PREFIX + + "appenderRefByProperty.xml"); + final Logger logger = loggerContext + .getLogger("ch.qos.logback.classic.joran"); + final ListAppender listAppender = (ListAppender) logger.getAppender("A"); + assertEquals(0, listAppender.list.size()); + final String msg = "hello world"; + logger.info(msg); + assertEquals(1, listAppender.list.size()); + System.clearProperty(propertyName); + } + + @Test public void statusListener() throws JoranException { configure(ClassicTestConstants.JORAN_INPUT_PREFIX + "statusListener.xml"); // StatusPrinter.print(loggerContext); @@ -133,7 +149,7 @@ public class JoranConfiguratorTest { logger.debug(msg); StringListAppender<ILoggingEvent> slAppender = (StringListAppender<ILoggingEvent>) loggerContext - .getLogger("root").getAppender("STR_LIST"); + .getLogger("root").getAppender("STR_LIST"); assertNotNull(slAppender); assertEquals(2, slAppender.strList.size()); assertTrue(slAppender.strList.get(0).contains(" DEBUG - toto")); @@ -181,7 +197,7 @@ public class JoranConfiguratorTest { @SuppressWarnings("unchecked") ListAppender<ILoggingEvent> listAppender = (ListAppender) root - .getAppender("LIST"); + .getAppender("LIST"); assertNotNull(listAppender); assertEquals(1, listAppender.list.size()); @@ -201,7 +217,7 @@ public class JoranConfiguratorTest { @SuppressWarnings("unchecked") ListAppender<ILoggingEvent> listAppender = (ListAppender) root - .getAppender("LIST"); + .getAppender("LIST"); assertNotNull(listAppender); assertEquals(1, listAppender.list.size()); @@ -213,7 +229,7 @@ public class JoranConfiguratorTest { @Test public void testTurboDynamicThreshold() throws JoranException { configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "turboDynamicThreshold.xml"); + + "turboDynamicThreshold.xml"); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); @@ -233,7 +249,7 @@ public class JoranConfiguratorTest { @Test public void testTurboDynamicThreshold2() throws JoranException { configure(ClassicTestConstants.JORAN_INPUT_PREFIX - + "turboDynamicThreshold2.xml"); + + "turboDynamicThreshold2.xml"); ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertEquals(0, listAppender.list.size()); @@ -260,7 +276,7 @@ public class JoranConfiguratorTest { public void scan1() throws JoranException, IOException, InterruptedException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "scan1.xml"; + + "scan1.xml"; configure(configFileAsStr); File file = new File(configFileAsStr); @@ -280,10 +296,10 @@ public class JoranConfiguratorTest { @Test public void timestamp() throws JoranException, IOException, - InterruptedException { + InterruptedException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "timestamp.xml"; + + "timestamp.xml"; configure(configFileAsStr); String r = loggerContext.getProperty("testTimestamp"); @@ -295,30 +311,30 @@ public class JoranConfiguratorTest { @Test public void encoderCharset() throws JoranException, IOException, - InterruptedException { + InterruptedException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "encoderCharset.xml"; + + "encoderCharset.xml"; configure(configFileAsStr); - + ConsoleAppender<ILoggingEvent> consoleAppender = (ConsoleAppender<ILoggingEvent>) root.getAppender("CONSOLE"); assertNotNull(consoleAppender); LayoutWrappingEncoder<ILoggingEvent> encoder = (LayoutWrappingEncoder<ILoggingEvent>) consoleAppender.getEncoder(); - + assertEquals("UTF-8", encoder.getCharset().displayName()); - + StatusChecker checker = new StatusChecker(loggerContext); - assertTrue(checker.isErrorFree()); + assertTrue(checker.isErrorFree()); } void verifyJULLevel(String loggerName, Level expectedLevel) { - LogManager lm = LogManager.getLogManager(); + LogManager lm = LogManager.getLogManager(); java.util.logging.Logger julLogger = JULHelper.asJULLogger(loggerName); java.util.logging.Level julLevel = julLogger.getLevel(); - if(expectedLevel == null) { + if (expectedLevel == null) { assertNull(julLevel); } else { assertEquals(JULHelper.asJULLevel(expectedLevel), julLevel); @@ -329,13 +345,13 @@ public class JoranConfiguratorTest { @Test public void levelChangePropagator0() throws JoranException, IOException, - InterruptedException { + InterruptedException { java.util.logging.Logger.getLogger("xx").setLevel(java.util.logging.Level.INFO); String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "/jul/levelChangePropagator0.xml"; + + "/jul/levelChangePropagator0.xml"; configure(configFileAsStr); StatusChecker checker = new StatusChecker(loggerContext); - assertTrue(checker.isErrorFree()); + assertTrue(checker.isErrorFree()); verifyJULLevel("xx", null); verifyJULLevel("a.b.c", Level.WARN); verifyJULLevel(Logger.ROOT_LOGGER_NAME, Level.TRACE); @@ -343,10 +359,10 @@ public class JoranConfiguratorTest { @Test public void levelChangePropagator1() throws JoranException, IOException, - InterruptedException { + InterruptedException { java.util.logging.Logger.getLogger("xx").setLevel(java.util.logging.Level.INFO); String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX - + "/jul/levelChangePropagator1.xml"; + + "/jul/levelChangePropagator1.xml"; configure(configFileAsStr); StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree()); diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java index 8923f3b..7e82bbb 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/AppenderRefAction.java @@ -46,7 +46,7 @@ public class AppenderRefAction extends Action { AppenderAttachable appenderAttachable = (AppenderAttachable) o; - String appenderName = attributes.getValue(ActionConst.REF_ATTRIBUTE); + String appenderName = ec.subst(attributes.getValue(ActionConst.REF_ATTRIBUTE)); if (OptionHelper.isEmpty(appenderName)) { // print a meaningful error message and return diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index f8e3d00..36df255 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -82,18 +82,19 @@ <li><a href="http://code.google.com/p/openmeetings/">OpenMeetings</a></li> <li><a href="http://liftweb.net/">Lift</a></li> <li><a href="http://www.red5.org">Red5</a></li> + <li><a href="http://scalate.fusesource.org/">Scalate</a></li> </ul> </td> <td valign="top"> <ul> - <li><a href="http://scalate.fusesource.org/">Scalate</a></li> <li><a href="http://shibboleth.internet2.edu/">Shibboleth</a></li> <li><a href="http://sonar.codehaus.org/">Sonar</a></li> <li><a href="http://static.springsource.org/s2-dmserver/2.0.x/user-guide/htmlsingle/user…">SpringSource dm Server</a></li> <li><a href="http://www.streambase.com/developers/docs/latest/index.html">StreamBase</a></li> + <li><a href="http://www.eclipse.org/virgo/">Virgo Web Server</a></li> <li><a href="http://www.xuggle.com/xuggler/">Xuggler</a></li> </ul> </td> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 1e636a1..63a3e51 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -28,6 +28,25 @@ <hr width="80%" align="center" /> + <h3>October 13th, 2010 - Release of version 0.9.25</h3> + + <p>Logback-classic now supports <a + href="manual/configuration.html#LevelChangePropagator">propagation + of level changes from logback-classic onto the + j.u.l. framework</a>. This significantly reduces the performance + impact of disabled log statements making it reasonable for + real-world applications to use the <a + href="http://slf4j.org/legacy.html#jul-to-slf4j">jul-to-slf4j + bridge</a>. + </p> + + <p>The <code><appender-ref></code> element now supports + <a href="manual/configuration.html#variableSubstitution">variable substitution</a>, thus fixing <a + href="http://jira.qos.ch/browse/LBCLASSIC-224">LBCLASSIC-224</a> + as reported by David Harrigan. + + <hr width="80%" align="center" /> + <h3>June 30th, 2010 - Release of version 0.9.24</h3> <p>Fixed NullPointerException thrown by ----------------------------------------------------------------------- Summary of changes: .../src/test/input/joran/appenderRefByProperty.xml | 17 +++++ .../classic/joran/JoranConfiguratorTest.java | 62 ++++++++++++------- .../core/joran/action/AppenderRefAction.java | 2 +- logback-site/src/site/pages/index.html | 3 +- logback-site/src/site/pages/news.html | 19 ++++++ 5 files changed, 78 insertions(+), 25 deletions(-) create mode 100644 logback-classic/src/test/input/joran/appenderRefByProperty.xml 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.24-27-ge519c39
by git-noreply＠pixie.qos.ch 13 Oct '10

13 Oct '10

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 e519c39a35da84d83a8c5121490551473d6f92fa (commit) from 55270dc26b29a3c36ae62661bc33f4291ae71b6d (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=e519c39a35da84d83a8c5121… http://github.com/ceki/logback/commit/e519c39a35da84d83a8c5121490551473d6f9… commit e519c39a35da84d83a8c5121490551473d6f92fa Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Oct 13 18:47:13 2010 +0200 - work on LevelChangePropagator completed. diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java index 765498a..eecff0c 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/JoranConfigurator.java @@ -13,15 +13,7 @@ */ package ch.qos.logback.classic.joran; -import ch.qos.logback.classic.joran.action.ConfigurationAction; -import ch.qos.logback.classic.joran.action.ConsolePluginAction; -import ch.qos.logback.classic.joran.action.ContextNameAction; -import ch.qos.logback.classic.joran.action.EvaluatorAction; -import ch.qos.logback.classic.joran.action.InsertFromJNDIAction; -import ch.qos.logback.classic.joran.action.JMXConfiguratorAction; -import ch.qos.logback.classic.joran.action.LevelAction; -import ch.qos.logback.classic.joran.action.LoggerAction; -import ch.qos.logback.classic.joran.action.RootLoggerAction; +import ch.qos.logback.classic.joran.action.*; import ch.qos.logback.classic.sift.SiftAction; import ch.qos.logback.classic.spi.PlatformInfo; import ch.qos.logback.classic.util.DefaultNestedComponentRules; @@ -55,6 +47,8 @@ public class JoranConfigurator extends JoranConfiguratorBase { rs.addRule(new Pattern("configuration/contextName"), new ContextNameAction()); + rs.addRule(new Pattern("configuration/contextListener"), + new LoggerContextListenerAction()); rs.addRule(new Pattern("configuration/insertFromJNDI"), new InsertFromJNDIAction()); rs.addRule(new Pattern("configuration/evaluator"), new EvaluatorAction()); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java index 5f77002..a50fb49 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/JMXConfiguratorAction.java @@ -60,7 +60,7 @@ public class JMXConfiguratorAction extends Action { ObjectName objectName = MBeanUtil.string2ObjectName(context, this, objectNameAsStr); if (objectName == null) { - addError("Failed to for ObjectName for ["+objectNameAsStr+"]"); + addError("Failed construct ObjectName for ["+objectNameAsStr+"]"); return; } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java index fe6890e..ff1e65b 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/LoggerContextListenerAction.java @@ -1,6 +1,6 @@ /** * Logback: the reliable, generic, fast and flexible logging framework. - * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * Copyright (C) 1999-2010, QOS.ch. All rights reserved. * * This program and the accompanying materials are dual-licensed under * either the terms of the Eclipse Public License v1.0 as published by @@ -20,6 +20,7 @@ import javax.management.ObjectName; import ch.qos.logback.classic.spi.LoggerContextListener; import ch.qos.logback.core.boolex.EventEvaluator; +import ch.qos.logback.core.spi.ContextAware; import ch.qos.logback.core.spi.LifeCycle; import org.xml.sax.Attributes; @@ -53,6 +54,10 @@ public class LoggerContextListenerAction extends Action { lcl = (LoggerContextListener) OptionHelper.instantiateByClassName( className, LoggerContextListener.class, context); + if(lcl instanceof ContextAware) { + ((ContextAware) lcl).setContext(context); + } + ec.pushObject(lcl); addInfo("Adding LoggerContextListener of type [" + className + "] to the object stack"); @@ -73,6 +78,11 @@ public class LoggerContextListenerAction extends Action { if (o != lcl) { addWarn("The object on the top the of the stack is not the LoggerContextListener pushed earlier."); } else { + if (lcl instanceof LifeCycle) { + ((LifeCycle) lcl).start(); + addInfo("Starting LoggerContextListener"); + } + ((LoggerContext) context).addListener(lcl); ec.popObject(); } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java index 047269b..34f3045 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/joran/action/RootLoggerAction.java @@ -40,7 +40,6 @@ public class RootLoggerAction extends Action { addInfo("Setting level of ROOT logger to " + level); root.setLevel(level); } - ec.pushObject(root); } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java b/logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java new file mode 100644 index 0000000..05d52bb --- /dev/null +++ b/logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java @@ -0,0 +1,56 @@ +package ch.qos.logback.classic.jul; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; + +public class JULHelper { + + + static public final boolean isRegularNonRootLogger(java.util.logging.Logger julLogger) { + if (julLogger == null) + return false; + return !julLogger.getName().equals(""); + } + + static public final boolean isRoot(java.util.logging.Logger julLogger) { + if (julLogger == null) + return false; + return julLogger.getName().equals(""); + } + + static public java.util.logging.Level asJULLevel(Level lbLevel) { + switch (lbLevel.levelInt) { + case Level.TRACE_INT: + return java.util.logging.Level.FINEST; + case Level.DEBUG_INT: + return java.util.logging.Level.FINE; + case Level.INFO_INT: + return java.util.logging.Level.INFO; + case Level.WARN_INT: + return java.util.logging.Level.WARNING; + case Level.ERROR_INT: + return java.util.logging.Level.SEVERE; + default: + throw new IllegalArgumentException("Unexpected level [" + lbLevel + "]"); + } + } + + static public String asJULLoggerName(String loggerName) { + if (Logger.ROOT_LOGGER_NAME.equals(loggerName)) + return ""; + else + return loggerName; + } + + static public java.util.logging.Logger asJULLogger(String loggerName) { + String julLoggerName = asJULLoggerName(loggerName); + return java.util.logging.Logger.getLogger(julLoggerName); + } + + static public java.util.logging.Logger asJULLogger(Logger logger) { + return asJULLogger(logger.getName()); + } + +} + + diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/jul/LevelChangePropagator.java b/logback-classic/src/main/java/ch/qos/logback/classic/jul/LevelChangePropagator.java new file mode 100644 index 0000000..adfe07c --- /dev/null +++ b/logback-classic/src/main/java/ch/qos/logback/classic/jul/LevelChangePropagator.java @@ -0,0 +1,105 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2010, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.classic.jul; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.spi.LoggerContextListener; +import ch.qos.logback.core.spi.ContextAwareBase; +import ch.qos.logback.core.spi.LifeCycle; + +import java.util.Enumeration; +import java.util.List; +import java.util.logging.LogManager; + + +/** + * Propagate level changes made to a logback logger into the equivalent logger in j.u.l. + */ +public class LevelChangePropagator extends ContextAwareBase implements LoggerContextListener, LifeCycle { + + boolean isStarted = false; + + boolean resetJUL = false; + + public void setResetJUL(boolean resetJUL) { + this.resetJUL = resetJUL; + } + + public boolean isResetResistant() { + return false; + } + + public void onStart(LoggerContext context) { + } + + public void onReset(LoggerContext context) { + } + + public void onStop(LoggerContext context) { + } + + public void onLevelChange(Logger logger, Level level) { + propagate(logger, level); + } + + private void propagate(Logger logger, Level level) { + addInfo("Propagating " + level + " level on " + logger + " onto the JUL framework"); + java.util.logging.Logger julLogger = JULHelper.asJULLogger(logger); + java.util.logging.Level julLevel = JULHelper.asJULLevel(level); + julLogger.setLevel(julLevel); + } + + public void resetJULLevels() { + LogManager lm = LogManager.getLogManager(); + + Enumeration e = lm.getLoggerNames(); + while (e.hasMoreElements()) { + String loggerName = (String) e.nextElement(); + java.util.logging.Logger julLogger = lm.getLogger(loggerName); + if (JULHelper.isRegularNonRootLogger(julLogger) && julLogger.getLevel() != null) { + addInfo("Setting **** level of jul logger [" + loggerName + "] to null"); + julLogger.setLevel(null); + } + } + } + + private void propagateExistingLoggerLevels() { + LoggerContext loggerContext = (LoggerContext) context; + List<Logger> loggerList = loggerContext.getLoggerList(); + for (Logger l : loggerList) { + if (l.getLevel() != null) { + propagate(l, l.getLevel()); + } + } + } + + public void start() { + if (resetJUL) { + resetJULLevels(); + } + propagateExistingLoggerLevels(); + + isStarted = true; + } + + public void stop() { + isStarted = false; + } + + public boolean isStarted() { + return isStarted; + } +} diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/jul/package.html b/logback-classic/src/main/java/ch/qos/logback/classic/jul/package.html new file mode 100644 index 0000000..6c24ec4 --- /dev/null +++ b/logback-classic/src/main/java/ch/qos/logback/classic/jul/package.html @@ -0,0 +1,9 @@ + +<html> + + +<body> + Logback <-> java.util.logging (JUL) integration. +</body> + +</html> \ No newline at end of file diff --git a/logback-classic/src/test/input/joran/jul/levelChangePropagator0.xml b/logback-classic/src/test/input/joran/jul/levelChangePropagator0.xml new file mode 100644 index 0000000..026462f --- /dev/null +++ b/logback-classic/src/test/input/joran/jul/levelChangePropagator0.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="false"> + + <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"> + <resetJUL>true</resetJUL> + </contextListener> + <logger name="a.b.c" level="WARN" /> + <root level="TRACE"/> + +</configuration> diff --git a/logback-classic/src/test/input/joran/jul/levelChangePropagator1.xml b/logback-classic/src/test/input/joran/jul/levelChangePropagator1.xml new file mode 100644 index 0000000..cb73f2f --- /dev/null +++ b/logback-classic/src/test/input/joran/jul/levelChangePropagator1.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration debug="false"> + + <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/> + <logger name="a.b.c" level="WARN" /> + <root level="TRACE"/> + +</configuration> diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java index 2473580..513fe2f 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/AllClassicTest.java @@ -19,23 +19,24 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses({org.slf4j.impl.PackageTest.class, - ch.qos.logback.classic.PackageTest.class, - ch.qos.logback.classic.util.PackageTest.class, - ch.qos.logback.classic.control.PackageTest.class, - ch.qos.logback.classic.joran.PackageTest.class, - ch.qos.logback.classic.rolling.PackageTest.class, - ch.qos.logback.classic.jmx.PackageTest.class, - ch.qos.logback.classic.boolex.PackageTest.class, - ch.qos.logback.classic.selector.PackageTest.class, - ch.qos.logback.classic.html.PackageTest.class, - ch.qos.logback.classic.net.PackageTest.class, - ch.qos.logback.classic.pattern.PackageTest.class, - ch.qos.logback.classic.encoder.PackageTest.class, - ch.qos.logback.classic.db.PackageTest.class, - ch.qos.logback.classic.spi.PackageTest.class, - ch.qos.logback.classic.turbo.PackageTest.class, - ch.qos.logback.classic.sift.PackageTest.class, - ch.qos.logback.classic.issue.PackageTest.class}) + ch.qos.logback.classic.PackageTest.class, + ch.qos.logback.classic.util.PackageTest.class, + ch.qos.logback.classic.control.PackageTest.class, + ch.qos.logback.classic.joran.PackageTest.class, + ch.qos.logback.classic.rolling.PackageTest.class, + ch.qos.logback.classic.jmx.PackageTest.class, + ch.qos.logback.classic.boolex.PackageTest.class, + ch.qos.logback.classic.selector.PackageTest.class, + ch.qos.logback.classic.html.PackageTest.class, + ch.qos.logback.classic.net.PackageTest.class, + ch.qos.logback.classic.pattern.PackageTest.class, + ch.qos.logback.classic.encoder.PackageTest.class, + ch.qos.logback.classic.db.PackageTest.class, + ch.qos.logback.classic.spi.PackageTest.class, + ch.qos.logback.classic.turbo.PackageTest.class, + ch.qos.logback.classic.sift.PackageTest.class, + ch.qos.logback.classic.jul.PackageTest.class, + ch.qos.logback.classic.issue.PackageTest.class}) public class AllClassicTest { } 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 6512023..8f82d6c 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 @@ -13,15 +13,14 @@ */ package ch.qos.logback.classic.joran; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.logging.LogManager; +import ch.qos.logback.classic.jul.JULHelper; +import ch.qos.logback.core.util.StatusPrinter; import org.junit.Test; import org.slf4j.MDC; @@ -41,6 +40,8 @@ import ch.qos.logback.core.read.ListAppender; import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.StringListAppender; +import static org.junit.Assert.*; + public class JoranConfiguratorTest { LoggerContext loggerContext = new LoggerContext(); @@ -309,8 +310,50 @@ public class JoranConfiguratorTest { StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree()); } - + void verifyJULLevel(String loggerName, Level expectedLevel) { + LogManager lm = LogManager.getLogManager(); + + java.util.logging.Logger julLogger = JULHelper.asJULLogger(loggerName); + + java.util.logging.Level julLevel = julLogger.getLevel(); + + if(expectedLevel == null) { + assertNull(julLevel); + } else { + assertEquals(JULHelper.asJULLevel(expectedLevel), julLevel); + } + + + } + + @Test + public void levelChangePropagator0() throws JoranException, IOException, + InterruptedException { + java.util.logging.Logger.getLogger("xx").setLevel(java.util.logging.Level.INFO); + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + + "/jul/levelChangePropagator0.xml"; + configure(configFileAsStr); + StatusChecker checker = new StatusChecker(loggerContext); + assertTrue(checker.isErrorFree()); + verifyJULLevel("xx", null); + verifyJULLevel("a.b.c", Level.WARN); + verifyJULLevel(Logger.ROOT_LOGGER_NAME, Level.TRACE); + } + + @Test + public void levelChangePropagator1() throws JoranException, IOException, + InterruptedException { + java.util.logging.Logger.getLogger("xx").setLevel(java.util.logging.Level.INFO); + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + + "/jul/levelChangePropagator1.xml"; + configure(configFileAsStr); + StatusChecker checker = new StatusChecker(loggerContext); + assertTrue(checker.isErrorFree()); + verifyJULLevel("xx", Level.INFO); + verifyJULLevel("a.b.c", Level.WARN); + verifyJULLevel(Logger.ROOT_LOGGER_NAME, Level.TRACE); + } } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java new file mode 100644 index 0000000..4f4eb06 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java @@ -0,0 +1,59 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2010, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.classic.jul; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + + +public class LevelChangePropagatorTest { + LoggerContext loggerContext = new LoggerContext(); + LevelChangePropagator levelChangePropagator = new LevelChangePropagator(); + + @Before + public void setUp() { + levelChangePropagator.setContext(loggerContext); + loggerContext.addListener(levelChangePropagator); + } + + void checkLevelChange(String loggerName, Level level) { + Logger logger = loggerContext.getLogger(loggerName); + logger.setLevel(level); + java.util.logging.Logger julLogger = JULHelper.asJULLogger(logger); + java.util.logging.Level julLevel = JULHelper.asJULLevel(level); + + assertEquals(julLevel, julLogger.getLevel()); + + + } + + @Test + public void smoke() { + checkLevelChange("a", Level.INFO); + checkLevelChange("a.b", Level.DEBUG); + + } + + @Test + public void root() { + checkLevelChange(Logger.ROOT_LOGGER_NAME, Level.TRACE); + } + +} diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/jul/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/jul/PackageTest.java new file mode 100644 index 0000000..d47f9f6 --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/jul/PackageTest.java @@ -0,0 +1,23 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2009, QOS.ch. All rights reserved. + * + * This program and the accompanying materials are dual-licensed under + * either the terms of the Eclipse Public License v1.0 as published by + * the Eclipse Foundation + * + * or (per the licensee's choosing) + * + * under the terms of the GNU Lesser General Public License version 2.1 + * as published by the Free Software Foundation. + */ +package ch.qos.logback.classic.jul; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +(a)RunWith(Suite.class) +(a)SuiteClasses({LevelChangePropagatorTest.class}) +public class PackageTest { +} \ No newline at end of file diff --git a/logback-site/src/site/pages/documentation.html b/logback-site/src/site/pages/documentation.html index 53da26f..3665b26 100644 --- a/logback-site/src/site/pages/documentation.html +++ b/logback-site/src/site/pages/documentation.html @@ -125,6 +125,11 @@ en Production - Les fichiers de logs</a> by Cyrille Le Clerc </li> + <li> + <a + href="http://blog.courtine.org/2010/09/13/logback-ou-log4j/">Logback + ou Log4J?</a> by Benoit Courtine + </li> </ul> diff --git a/logback-site/src/site/pages/manual/appenders.html b/logback-site/src/site/pages/manual/appenders.html index 3944286..29c198f 100644 --- a/logback-site/src/site/pages/manual/appenders.html +++ b/logback-site/src/site/pages/manual/appenders.html @@ -151,7 +151,7 @@ public interface Appender<E> extends LifeCycle, ContextAware, FilterAttachabl access to the appender. </p> - <p>Since such syncronization is not always appropriate, logback + <p>Since such synchronization is not always appropriate, logback ships with <a href="../xref/ch/qos/logback/core/UnsynchronizedAppenderBase.html"><code>ch.qos.logback.core.UnsynchronizedAppenderBase</code></a> which is very similar to the <a @@ -243,7 +243,7 @@ public interface Appender<E> extends LifeCycle, ContextAware, FilterAttachabl provides basic services that other appenders build upon. Users do not usually instantiate <code>OutputStreamAppender</code> objects directly. Since in general the <code>java.io.OutputStream</code> - type cannot be conveninetly mapped to a string, as there is no way + type cannot be conveniently mapped to a string, as there is no way to specify the target <code>OutputStream</code> object in a configuration script. Simply put, you cannot configure a <code>OutputStreamAppender</code> from a configuration file. @@ -274,14 +274,14 @@ public interface Appender<E> extends LifeCycle, ContextAware, FilterAttachabl <p>Given the structure of current hard drives and performance tests we have conducted, it appears that turning off immediate flushing or buffering of character to byte conversions have rather small impact - on performance. As such, as of logback vesion 0.9.19, the <span + on performance. As such, as of logback version 0.9.19, the <span class="option">ImmediateFlush</span>, <span class="option">BufferedIO</span> and <span class="option">BufferSize</span> properties have been removed without replacement. </p> - <p>The <code>OutputStreamAppender</code> is the superclass of three other + <p>The <code>OutputStreamAppender</code> is the super-class of three other appenders, namely <code>ConsoleAppender</code>, <code>FileAppender</code> which in turn is the super class of <code>RollingFileAppender</code>. The next figure illustrates the @@ -936,7 +936,7 @@ public interface RollingPolicy extends LifeCycle { omitted. <p>By setting the <span class="option">file</span> property - of the containig <code>FileAppender</code>, you can decouple + of the containing <code>FileAppender</code>, you can decouple the location of the active log file and the location of the archived log files. The current logs will be always targeted at the file specified by the <span class="option">file</span> @@ -1324,7 +1324,7 @@ public interface TriggeringPolicy<E> extends LifeCycle { <p>The most widely-used triggering policy, namely <code>TimeBasedRollingPolicy</code> which also doubles as a - rolliging policy, was already <a + rolling policy, was already <a href="#TimeBasedRollingPolicy">discussed earlier</a> along with other rolling policies. </p> @@ -2224,7 +2224,7 @@ Context ctx = new InitialContext(env);</pre> same value so that the same buffer is used for all events. </p> - <p>By specifiying a discriminator other than the default + <p>By specifying a discriminator other than the default one, it would be possible to receive email messages containing a events pertaining to a particular user, user session or client IP address. @@ -2552,7 +2552,7 @@ logger.error(<b>notifyAdminMarker</b>, new Exception("Just testing"));</pre> <p>The next configuration file will cause outgoing emails to be - sent only in presensce of events bearing the NOTIFY_ADMIN or the + sent only in presence of events bearing the NOTIFY_ADMIN or the TRANSACTION_FAILURE marker. </p> @@ -2676,7 +2676,7 @@ logger.error(<b>notifyAdminMarker</b>, <p>The next example illustrates the use of<a href="../xref/ch/qos/logback/classic/sift/MDCBasedDiscriminator.html">MDCBasedDiscriminator</a> - in conjuction with the MDC key named "req.remoteHost", assumed to + in conjunction with the MDC key named "req.remoteHost", assumed to contain the IP address of the remote host accessing a fictitious application. In a web-application, you could use <a href="mdc.html#mis">MDCInsertingServletFilter</a> to populate MDC diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 2d0db3e..0d70252 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1699,6 +1699,62 @@ fileName=myApp.log </ul> +  + <h2><a name="contextListener" href="#contextListener">Adding a context listener</a></h2> + + <p>Instances of the <a + href="../xref/ch/qos/logback/classic/spi/LoggerContextListener.html">LoggerContextListener</a> + interface listen to events pertaining to the lifecycle of a logger + context. + </p> + + + <p><code>JMXConfigurator</code> is one implementation of the + <code>LoggerContextListener</code> interface. It is desribed in a <a + href="jmxConfig.html">subsequent chapter</a>. + </p> + + <h3><a name="LevelChangePropagator" + href="#LevelChangePropagator">LevelChangePropagator</a></h3> + + <p>As of version 0.9.25, logback-classic ships with <a + href="../xref/ch/qos/logback/classic/jul/LevelChangePropagator.html">LevelChangePropagator</a>, + an implementation of <code>LoggerContextListener</code> which + propagates changes made to the level of any logback-classic logger + onto the java.util.logging framework. Such propagation eliminates + the performance impact of disabled log statements. Instances of <a + href="http://download.oracle.com/javase/1.5.0/docs/api/java/util/logging/LogRecor…">LogRecord</a> + will be sent to logback (via SLF4J) only for enabled log + statements. This makes it reasonable for real-world applications to + use the <a + href="http://www.slf4j.org/legacy.html#jul-to-slf4j">jul-to-slf4j</a> + bridge. + </p> + + + <p>The contextListener element can be used to install <code>LevelChangePropagator</code> as shown next.</p> + + <pre class="prettyprint source"><configuration debug="false"> + <b><contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"/></b> + .... +</configuration></pre> + + <p>Setting the <span class="option">resetJUL</span> propery of + LevelChangePropagator will reset all previous level configurations + of all j.u.l. loggers. Previously installed handlers however will be + left untouched.</p> + + <pre class="prettyprint source"><configuration debug="false"> + <contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator"> + <b><resetJUL>true</resetJUL></b> + </contextListener> + .... +</configuration></pre> + <p> + </p> + + + <script src="../templates/footer.js" type="text/javascript"></script> </div> </body> ----------------------------------------------------------------------- Summary of changes: .../logback/classic/joran/JoranConfigurator.java | 12 +-- .../joran/action/JMXConfiguratorAction.java | 2 +- .../joran/action/LoggerContextListenerAction.java | 12 ++- .../classic/joran/action/RootLoggerAction.java | 1 - .../java/ch/qos/logback/classic/jul/JULHelper.java | 56 +++++++++++ .../logback/classic/jul/LevelChangePropagator.java | 105 ++++++++++++++++++++ .../java/ch/qos/logback/classic/jul/package.html | 9 ++ .../input/joran/jul/levelChangePropagator0.xml | 12 +++ .../input/joran/jul/levelChangePropagator1.xml | 10 ++ .../ch/qos/logback/classic/AllClassicTest.java | 35 ++++--- .../classic/joran/JoranConfiguratorTest.java | 53 +++++++++- .../classic/jul/LevelChangePropagatorTest.java | 59 +++++++++++ .../classic/{control => jul}/PackageTest.java | 5 +- logback-site/src/site/pages/documentation.html | 5 + logback-site/src/site/pages/manual/appenders.html | 18 ++-- .../src/site/pages/manual/configuration.html | 56 +++++++++++ 16 files changed, 404 insertions(+), 46 deletions(-) create mode 100644 logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java create mode 100644 logback-classic/src/main/java/ch/qos/logback/classic/jul/LevelChangePropagator.java create mode 100644 logback-classic/src/main/java/ch/qos/logback/classic/jul/package.html create mode 100644 logback-classic/src/test/input/joran/jul/levelChangePropagator0.xml create mode 100644 logback-classic/src/test/input/joran/jul/levelChangePropagator1.xml create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java copy logback-classic/src/test/java/ch/qos/logback/classic/{control => jul}/PackageTest.java (88%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-159) AppenderBase and UnsynchronizedAppenderBsae do not allow exceptions to percolate to the application
by Ralph Goers (JIRA) 13 Oct '10

13 Oct '10

AppenderBase and UnsynchronizedAppenderBsae do not allow exceptions to percolate to the application --------------------------------------------------------------------------------------------------- Key: LBCORE-159 URL: http://jira.qos.ch/browse/LBCORE-159 Project: logback-core Issue Type: Improvement Components: Appender Affects Versions: 0.9.24 Environment: All Reporter: Ralph Goers Assignee: Logback dev list When logging some events the application needs to be informed that the publishing of the event failed. Currently, AppenderBase and UnsynchronizedAppenderBase catch and handle all exceptions making it impossible to use any of the out-of-the box Logback appenders in these situations. This is particularly important when performing auditing and sending the events to a database, JMS queue, socket, etc. as the application would want to fail the current operation if it cannot be audited. -- 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 10

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.24-26-g55270dc
by git-noreply＠pixie.qos.ch 12 Oct '10

12 Oct '10

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 55270dc26b29a3c36ae62661bc33f4291ae71b6d (commit) from b8b8a86ea7fb2a8a35751ebbdc0929633c784303 (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=55270dc26b29a3c36ae62661… http://github.com/ceki/logback/commit/55270dc26b29a3c36ae62661bc33f4291ae71… commit 55270dc26b29a3c36ae62661bc33f4291ae71b6d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Oct 12 22:27:28 2010 +0200 - added logger level change support in LoggerContextListener 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 67c7b43..5dcbf7a 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 @@ -184,6 +184,8 @@ public final class Logger implements org.slf4j.Logger, LocationAwareLogger, child.handleParentLevelChange(effectiveLevelInt); } } + // inform listeners + loggerContext.fireOnLevelChange(this, newLevel); } /** 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 b81c581..c492817 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 @@ -308,6 +308,12 @@ public class LoggerContext extends ContextBase implements ILoggerFactory, return new ArrayList<LoggerContextListener>(loggerContextListenerList); } + void fireOnLevelChange(Logger logger, Level level) { + for (LoggerContextListener listener : loggerContextListenerList) { + listener.onLevelChange(logger, level); + } + } + private void fireOnReset() { for (LoggerContextListener listener : loggerContextListenerList) { listener.onReset(this); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/jmx/JMXConfigurator.java b/logback-classic/src/main/java/ch/qos/logback/classic/jmx/JMXConfigurator.java index 4bada7e..26edee4 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/jmx/JMXConfigurator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/jmx/JMXConfigurator.java @@ -261,6 +261,10 @@ public class JMXConfigurator extends ContextAwareBase implements stop(); } + public void onLevelChange(Logger logger, Level level) { + // nothing to do + } + public void onReset(LoggerContext context) { addInfo("onReset() method called JMXActivator [" + objectNameAsString + "]"); } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextListener.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextListener.java index 58fdf48..21fc330 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextListener.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/LoggerContextListener.java @@ -13,6 +13,8 @@ */ package ch.qos.logback.classic.spi; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; public interface LoggerContextListener { @@ -27,4 +29,5 @@ public interface LoggerContextListener { public void onStart(LoggerContext context); public void onReset(LoggerContext context); public void onStop(LoggerContext context); + public void onLevelChange(Logger logger, Level level); } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicContextListener.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicContextListener.java index 4e32c1e..5cec4cb 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicContextListener.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/BasicContextListener.java @@ -13,14 +13,18 @@ */ package ch.qos.logback.classic.spi; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; public class BasicContextListener implements LoggerContextListener { - enum UpdateType { NONE, START, RESET, STOP}; + enum UpdateType { NONE, START, RESET, STOP , LEVEL_CHANGE}; UpdateType updateType = UpdateType.NONE; LoggerContext context; + Logger logger; + Level level; boolean resetResistant; @@ -42,8 +46,15 @@ public class BasicContextListener implements LoggerContextListener { updateType = UpdateType.STOP;; this.context = context; } - + public boolean isResetResistant() { return resetResistant; } + + public void onLevelChange(Logger logger, Level level) { + updateType = UpdateType.LEVEL_CHANGE; + this.logger = logger; + this.level = level; + } + } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/spi/ContextListenerTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/spi/ContextListenerTest.java index 95c3186..9d10c90 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/spi/ContextListenerTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/spi/ContextListenerTest.java @@ -15,17 +15,19 @@ package ch.qos.logback.classic.spi; import static org.junit.Assert.assertEquals; +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; import org.junit.Before; import org.junit.Test; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.BasicContextListener.UpdateType; -public class ContextListenerTest { - +public class ContextListenerTest { + LoggerContext context; BasicContextListener listener; - + @Before public void setUp() throws Exception { context = new LoggerContext(); @@ -61,4 +63,21 @@ public class ContextListenerTest { assertEquals(UpdateType.START, listener.updateType); assertEquals(listener.context, context); } + + void checkLevelChange(String loggerName, Level level) { + Logger logger = context.getLogger(loggerName); + logger.setLevel(level); + + assertEquals(UpdateType.LEVEL_CHANGE, listener.updateType); + assertEquals(listener.logger, logger); + assertEquals(listener.level, level); + + } + + @Test + public void testLevelChange() { + checkLevelChange("a", Level.INFO); + checkLevelChange("a.b", Level.ERROR); + checkLevelChange("a.b.c", Level.DEBUG); + } } diff --git a/logback-site/src/site/pages/manual/encoders.html b/logback-site/src/site/pages/manual/encoders.html index 237bfd9..70dc3de 100644 --- a/logback-site/src/site/pages/manual/encoders.html +++ b/logback-site/src/site/pages/manual/encoders.html @@ -65,12 +65,13 @@ out. </p> - <p>At present time (2010-03-08), <code>PatternLayotEncoder</code> - is the only really useful encoder. It merely wraps a - <code>PatternLayout</code> which does most of the work. Thus, may - seem that encoders do not bring much to the table except needless - complexity. However, we hope that with the advent of new and - powerful encoders this impression will change.</p> + <p>At the present time (2010-03-08), + <code>PatternLayoutEncoder</code> is the only really useful + encoder. It merely wraps a <code>PatternLayout</code> which does + most of the work. Thus, may seem that encoders do not bring much + to the table except needless complexity. However, we hope that + with the advent of new and powerful encoders this impression will + change.</p> <h2><a name="interface" href="#interface">Encoder interface</a></h2> @@ -185,6 +186,10 @@ public class LayoutWrappingEncoder<E> extends EncoderBase<E> { logback error codes</a>. </p> + + + <script src="../templates/footer.js" type="text/javascript"></script> + </div> </body> </html> ----------------------------------------------------------------------- Summary of changes: .../main/java/ch/qos/logback/classic/Logger.java | 2 + .../java/ch/qos/logback/classic/LoggerContext.java | 6 ++++ .../qos/logback/classic/jmx/JMXConfigurator.java | 4 +++ .../logback/classic/spi/LoggerContextListener.java | 3 ++ .../logback/classic/spi/BasicContextListener.java | 15 ++++++++++- .../logback/classic/spi/ContextListenerTest.java | 25 +++++++++++++++++-- logback-site/src/site/pages/manual/encoders.html | 17 ++++++++---- 7 files changed, 61 insertions(+), 11 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0