- logback-dev - mailman3.qos.ch

Release of logback v0.9.28
by Ceki Gülcü 25 Jan '11

25 Jan '11

Hello all, I am happy to announce the release of logback version 0.9.28. Please refer to the news page for precise details. http://logback.qos.ch/news.html You can download logback, including full source code, class files and documentation on our download page, shown below. http://logback.qos.ch/download.html You can receive logback related announcements by subscribing to the QOS.ch announce mailing list. To subscribe to QOS.ch announce list, please visit the following URL. http://www.qos.ch/mailman/listinfo/announce Enjoy, -- Ceki

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-24-g8af4d7b
by git-noreply＠pixie.qos.ch 25 Jan '11

25 Jan '11

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 8af4d7bdc94c647c6eb69980dab0696a927ae2fd (commit) from 06a5b692f14560636bd92d7bd7cf1f85830f4e55 (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=8af4d7bdc94c647c6eb69980… http://github.com/ceki/logback/commit/8af4d7bdc94c647c6eb69980dab0696a927ae… commit 8af4d7bdc94c647c6eb69980dab0696a927ae2fd Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Jan 25 23:02:45 2011 +0100 preparing release 0.9.28 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index dcfeb31..5e0600b 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.28-SNAPSHOT</version> + <version>0.9.28</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index b61e6d6..3bfccac 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.28-SNAPSHOT</version> + <version>0.9.28</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index 9297f98..38fda24 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.28-SNAPSHOT</version> + <version>0.9.28</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 48b65ba..655cdb7 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.28-SNAPSHOT</version> + <version>0.9.28</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index a1707da..b2004c4 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.28-SNAPSHOT</version> + <version>0.9.28</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 6341755..04c2fd7 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.28-SNAPSHOT</version> + <version>0.9.28</version> <packaging>pom</packaging> <name>Logback-Parent</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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.27-23-g06a5b69
by git-noreply＠pixie.qos.ch 25 Jan '11

25 Jan '11

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 06a5b692f14560636bd92d7bd7cf1f85830f4e55 (commit) from b3b234ddef5a1ba6863cd922f4f410cde65c1a0d (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=06a5b692f14560636bd92d7b… http://github.com/ceki/logback/commit/06a5b692f14560636bd92d7bd7cf1f85830f4… commit 06a5b692f14560636bd92d7bd7cf1f85830f4e55 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Jan 25 23:01:46 2011 +0100 adding support for Java blocks in JaninoEventEvaluator diff --git a/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java b/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java index 0df2765..7702755 100644 --- a/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java +++ b/logback-access/src/main/java/ch/qos/logback/access/boolex/JaninoEventEvaluator.java @@ -25,37 +25,43 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<AccessEvent> public final static List<String> DEFAULT_PARAM_NAME_LIST = new ArrayList<String>(); public final static List<Class> DEFAULT_PARAM_TYPE_LIST = new ArrayList<Class>(); - + static { DEFAULT_PARAM_NAME_LIST.add("event"); DEFAULT_PARAM_TYPE_LIST.add(AccessEvent.class); } - - + + public JaninoEventEvaluator() { - + } - + protected String getDecoratedExpression() { - return getExpression(); + String expression = getExpression(); + if (!expression.contains("return")) { + expression = "return " + expression + ";"; + addInfo("Adding [return] prefix and a semicolon suffix. Expression becomes [" + expression + "]"); + addInfo("See also " + CoreConstants.CODES_URL + "#block"); + } + return expression; } protected String[] getParameterNames() { List<String> fullNameList = new ArrayList<String>(); fullNameList.addAll(DEFAULT_PARAM_NAME_LIST); - for(int i = 0; i < matcherList.size(); i++) { + for (int i = 0; i < matcherList.size(); i++) { Matcher m = (Matcher) matcherList.get(i); fullNameList.add(m.getName()); } - + return (String[]) fullNameList.toArray(CoreConstants.EMPTY_STRING_ARRAY); } protected Class[] getParameterTypes() { List<Class> fullTypeList = new ArrayList<Class>(); fullTypeList.addAll(DEFAULT_PARAM_TYPE_LIST); - for(int i = 0; i < matcherList.size(); i++) { + for (int i = 0; i < matcherList.size(); i++) { fullTypeList.add(Matcher.class); } return (Class[]) fullTypeList.toArray(CoreConstants.EMPTY_CLASS_ARRAY); @@ -64,16 +70,16 @@ public class JaninoEventEvaluator extends JaninoEventEvaluatorBase<AccessEvent> protected Object[] getParameterValues(AccessEvent event) { AccessEvent accessEvent = (AccessEvent) event; final int matcherListSize = matcherList.size(); - + int i = 0; - Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size()+matcherListSize]; + Object[] values = new Object[DEFAULT_PARAM_NAME_LIST.size() + matcherListSize]; values[i++] = accessEvent; - - for(int j = 0; j < matcherListSize; j++) { + + for (int j = 0; j < matcherListSize; j++) { values[i++] = (Matcher) matcherList.get(j); } - + return values; } diff --git a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java b/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java index ee455f3..47aada2 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java @@ -19,6 +19,7 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses( { ch.qos.logback.access.spi.PackageTest.class, + ch.qos.logback.access.boolex.PackageTest.class, ch.qos.logback.access.net.PackageTest.class, ch.qos.logback.access.pattern.PackageTest.class, ch.qos.logback.access.jetty.PackageTest.class, diff --git a/logback-access/src/test/java/ch/qos/logback/access/boolex/JaninoEventEvaluatorTest.java b/logback-access/src/test/java/ch/qos/logback/access/boolex/JaninoEventEvaluatorTest.java new file mode 100644 index 0000000..f16caac --- /dev/null +++ b/logback-access/src/test/java/ch/qos/logback/access/boolex/JaninoEventEvaluatorTest.java @@ -0,0 +1,80 @@ +/** + * 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.access.boolex; + + +import ch.qos.logback.access.dummy.DummyRequest; +import ch.qos.logback.access.dummy.DummyResponse; +import ch.qos.logback.access.dummy.DummyServerAdapter; +import ch.qos.logback.access.net.URLEvaluator; +import ch.qos.logback.access.spi.AccessEvent; +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.boolex.EvaluationException; +import ch.qos.logback.core.util.StatusPrinter; +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +public class JaninoEventEvaluatorTest { + + final String expectedURL1 = "testUrl1"; + final String expectedURL2 = "testUrl2"; + Context context = new ContextBase(); + JaninoEventEvaluator evaluator; + DummyRequest request; + DummyResponse response; + DummyServerAdapter serverAdapter; + + @Before + public void setUp() throws Exception { + evaluator = new JaninoEventEvaluator(); + evaluator.setContext(context); + request = new DummyRequest(); + response = new DummyResponse(); + serverAdapter = new DummyServerAdapter(request, response); + } + + + @Test + public void smoke() throws EvaluationException { + evaluator.setExpression("event.getProtocol().equals(\"testProtocol\")"); + evaluator.start(); + AccessEvent ae = new AccessEvent(request, response, serverAdapter); + assertTrue( evaluator.evaluate(ae)); + } + + @Test + public void block() throws EvaluationException { + evaluator.setExpression("String protocol = event.getProtocol();" + + "return protocol.equals(\"testProtocol\");"); + evaluator.start(); + AccessEvent ae = new AccessEvent(request, response, serverAdapter); + assertTrue(evaluator.evaluate(ae)); + } + + @Test + public void invalidExpression() throws EvaluationException { + evaluator.setExpression("return true"); + evaluator.start(); + AccessEvent ae = new AccessEvent(request, response, serverAdapter); + try { + evaluator.evaluate(ae); + fail("Was expecting an exception"); + } catch (IllegalStateException e) { + } + } +} diff --git a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java b/logback-access/src/test/java/ch/qos/logback/access/boolex/PackageTest.java similarity index 58% copy from logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java copy to logback-access/src/test/java/ch/qos/logback/access/boolex/PackageTest.java index ee455f3..e5261b4 100644 --- a/logback-access/src/test/java/ch/qos/logback/access/AllAccessTest.java +++ b/logback-access/src/test/java/ch/qos/logback/access/boolex/PackageTest.java @@ -11,20 +11,14 @@ * under the terms of the GNU Lesser General Public License version 2.1 * as published by the Free Software Foundation. */ -package ch.qos.logback.access; +package ch.qos.logback.access.boolex; +import junit.framework.TestCase; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { ch.qos.logback.access.spi.PackageTest.class, - ch.qos.logback.access.net.PackageTest.class, - ch.qos.logback.access.pattern.PackageTest.class, - ch.qos.logback.access.jetty.PackageTest.class, - ch.qos.logback.access.filter.PackageTest.class, - ch.qos.logback.access.servlet.PackageTest.class, - ch.qos.logback.access.sift.PackageTest.class }) -public class AllAccessTest { - -} +(a)SuiteClasses({JaninoEventEvaluatorTest.class}) +public class PackageTest extends TestCase { +} \ No newline at end of file diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java index 4d9d374..49838f2 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/boolex/JaninoEventEvaluator.java @@ -78,7 +78,14 @@ public class JaninoEventEvaluator extends } protected String getDecoratedExpression() { - return IMPORT_LEVEL + getExpression(); + String expression = getExpression(); + if(!expression.contains("return")) { + expression = "return "+expression +";"; + addInfo("Adding [return] prefix and a semicolon suffix. Expression becomes ["+expression+"]"); + addInfo("See also "+CoreConstants.CODES_URL+"#block"); + + } + return IMPORT_LEVEL + expression; } protected String[] getParameterNames() { diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java index 7430f46..e6a7fab 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/boolex/JaninoEventEvaluatorTest.java @@ -70,6 +70,7 @@ public class JaninoEventEvaluatorTest { jee.setExpression("message.equals(\"Some message\")"); jee.start(); + StatusPrinter.print(loggerContext); ILoggingEvent event = makeLoggingEvent(null); assertTrue(jee.evaluate(event)); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java b/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java index 6e0ebd8..7389295 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/boolex/JaninoEventEvaluatorBase.java @@ -17,6 +17,7 @@ import java.util.ArrayList; import java.util.List; import org.codehaus.janino.ExpressionEvaluator; +import org.codehaus.janino.ScriptEvaluator; /** * Abstract class which sets the groundwork for janino based evaluations. @@ -37,7 +38,7 @@ abstract public class JaninoEventEvaluatorBase<E> extends EventEvaluatorBase<E> private String expression; - ExpressionEvaluator ee; + ScriptEvaluator scriptEvaluator; private int errorCount = 0; abstract protected String getDecoratedExpression(); @@ -54,9 +55,8 @@ abstract public class JaninoEventEvaluatorBase<E> extends EventEvaluatorBase<E> public void start() { try { assert context != null; - ClassLoader cl = context.getClass().getClassLoader(); - ee = new ExpressionEvaluator(getDecoratedExpression(), EXPRESSION_TYPE, - getParameterNames(), getParameterTypes(), THROWN_EXCEPTIONS, cl); + scriptEvaluator = new ScriptEvaluator(getDecoratedExpression(), EXPRESSION_TYPE, + getParameterNames(), getParameterTypes(), THROWN_EXCEPTIONS); super.start(); } catch (Exception e) { addError( @@ -70,7 +70,7 @@ abstract public class JaninoEventEvaluatorBase<E> extends EventEvaluatorBase<E> + "] was called in stopped state"); } try { - Boolean result = (Boolean) ee.evaluate(getParameterValues(event)); + Boolean result = (Boolean) scriptEvaluator.evaluate(getParameterValues(event)); return result.booleanValue(); } catch (Exception ex) { errorCount++; diff --git a/logback-site/src/site/pages/codes.html b/logback-site/src/site/pages/codes.html index e80c770..7bf4ac2 100644 --- a/logback-site/src/site/pages/codes.html +++ b/logback-site/src/site/pages/codes.html @@ -468,6 +468,53 @@ </p> <hr/> + +  + <p><a name="block" href="#block">As of logback version 0.9.28, + JaninoEventEvaluator expects Java blocks.</a> + </p> + + <p>As of logback version 0.9.28, JaninoEvaluator expects Java + "block", i.e. the body of a method. In previous versions only + boolean expressions were allowed. For backward compatibility + reasons, whenever logback sees a boolean expression it will attempt + to convert it to a block by prefixing the expression with "return" + and suffixing it with a semicolon. + </p> + + <p>Boolean expressions can quickly become hairy. For example, the + following boolean expression is rather difficult to grok. +</p> + + <pre class="prettyprint source"> !logger.startsWith("org.apache.http") + || + ( logger.equals("org.apache.http.wire") && + (mdc != null && mdc.get("entity") != null + && + ((String) mdc.get("entity")).contains("someSpecialValue")) + && + !message.contains("someSecret") + )</pre> + + <p>whereas as its Java block equivalent is considerably easier to + follow.</p> + +<pre class="prettyprint source">if(logger.startsWith("org.apache.http")) + return true; + +if(mdc == null || mdc.get("entity") == null) + return false; + +String payee = (String) mdc.get("entity"); + +if(logger.equals("org.apache.http.wire") && + payee.contains("someSpecialValue") && + !message.contains("someSecret")) { + return true; +} + +return false;</pre> + <script src="templates/footer.js" type="text/javascript"></script> </div> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 372b410..17fc59e 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1525,7 +1525,8 @@ fileName=myApp.log configuration files with the help of <code><if></code>, <code><then></code> and <code><else></code> elements so that a single configuration file can adequately target several - environments. + environments. Note that conditional processing requires the <a + href="../setup.html#janino">Janino library</a>. </p> <p>The general format for conditional statements is shown below.</p> diff --git a/logback-site/src/site/pages/manual/filters.html b/logback-site/src/site/pages/manual/filters.html index f354b8c..0d9e9dd 100644 --- a/logback-site/src/site/pages/manual/filters.html +++ b/logback-site/src/site/pages/manual/filters.html @@ -366,8 +366,8 @@ public class SampleFilter extends Filter>ILoggingEvent> { <p>Logback-classic ships with another concrete <code>EventEvaluator</code> implementation called <a href="../xref/ch/qos/logback/classic/boolex/JaninoEventEvaluator.html">JaninoEventEvaluator</a> - taking arbitrary Java language boolean expressions as the - evaluation criteria. We refer to such Java language boolean + taking an arbitrary Java language block returning a boolean value + as the evaluation criteria. We refer to such Java language boolean expressions as "<em>evaluation expressions</em>". Evaluation expressions enable great flexibility in event filtering. <code>JaninoEventEvaluator</code> requires the <a @@ -534,7 +534,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <b><filter class="ch.qos.logback.core.filter.EvaluatorFilter"> <evaluator>  - <expression><span class="green">message.contains("billing")</span></expression> + <expression><span class="green">return message.contains("billing");</span></expression> </evaluator> <OnMismatch>NEUTRAL</OnMismatch> <OnMatch>DENY</OnMatch> @@ -565,7 +565,7 @@ public class SampleFilter extends Filter>ILoggingEvent> { <p>The <em>expression</em> element corresponds to the evaluation expression just discussed. The expression - <code>message.contains("billing")</code> returns a boolean + <code>return message.contains("billing");</code> returns a boolean value. Notice that the <em>message</em> variable is exported automatically by <code>JaninoEventEvaluator</code>. </p> @@ -621,6 +621,31 @@ java chapters.filters.FilterEvents src/main/java/chapters/filters/basicConfigura 0 [main] INFO chapters.filters.FilterEvents - logging statement 8 0 [main] INFO chapters.filters.FilterEvents - logging statement 9</p> + + <p>Evaluation expressions can be Java blocks. For example, the + following is a valid expression.</p> + + <pre class="prettyprint source"><evaluator> + <expression> + if(logger.startsWith("org.apache.http")) + return true; + + if(mdc == null || mdc.get("entity") == null) + return false; + + String payee = (String) mdc.get("entity"); + + if(logger.equals("org.apache.http.wire") &amp;&amp;  + payee.contains("someSpecialValue") &amp;&amp; + !message.contains("someSecret")) { + return true; + } + + return false; + </expression> +</evaluator></pre> + + <h2><a name="matcher" href="#matcher">Matchers</a></h2> <p>While it is possible to do pattern matching by invoking the <a @@ -1085,16 +1110,16 @@ logger.debug("Hello {}.", name1);</pre> can implement your own event evaluation logic by sub-classing <code>EventEvaluator</code>. Logback-access ships with a concrete implementation named <a - href="../xref/ch/qos/logback/access/boolex/JaninoEventEvaluator.html">JaninoEventEvaluator</a>. - It takes arbitrary Java language boolean expressions as the - evaluation criteria. We refer to such Java language boolean - expressions as "<em>evaluation expressions</em>". Evaluation - expressions enable great flexibility in event + href="../xref/ch/qos/logback/access/boolex/JaninoEventEvaluator.html">JaninoEventEvaluator</a>. + It takes arbitrary Java language boolean expressions as the + evaluation criteria. We refer to such Java language blocks as + "<em>evaluation expresisons</em>". Evaluation expressions enable + great flexibility in event filtering. <code>JaninoEventEvaluator</code> requires the <a href="http://docs.codehaus.org/display/JANINO/Home">Janino library</a>. Please see the <a href="../setup.html#janino">corresponding section</a> of the setup - document. + document. </p> <p>Evaluation expressions are compiled on-the-fly during the diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index af19296..c39fb87 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -28,7 +28,7 @@ <hr width="80%" align="center" /> - <h3>January xx, 2011 - Release of version 0.9.28</h3> + <h3>January 25th, 2011 - Release of version 0.9.28</h3> <div style="border: 1px solid #F44; background-color: #FED; padding-left: 1ex; padding-right: 1ex;"> @@ -50,6 +50,14 @@ start method now correctly sets the state of the instance. </p> + <p><code>JaninoEventEvaluator</code> now expects Java blocks + instead of boolean expressions. For even moderately complex + logical statements, blocks can be more convenient to read or to + write compared with boolean expressions. To ensure backward + compatibility, existing boolean expressions are converted into + blocks on the fly. + </p> + <p>Corrected handling of null valued arguments by DBAppender. This fixes <a href="http://jira.qos.ch/browse/LBCLASSIC-239">LBCLASSIC-239</a> ----------------------------------------------------------------------- Summary of changes: .../access/boolex/JaninoEventEvaluator.java | 34 +++++---- .../java/ch/qos/logback/access/AllAccessTest.java | 1 + .../JaninoEventEvaluatorTest.java} | 82 ++++++++++---------- .../access/{filter => boolex}/PackageTest.java | 5 +- .../classic/boolex/JaninoEventEvaluator.java | 9 ++- .../classic/boolex/JaninoEventEvaluatorTest.java | 1 + .../core/boolex/JaninoEventEvaluatorBase.java | 10 +- logback-site/src/site/pages/codes.html | 47 +++++++++++ .../src/site/pages/manual/configuration.html | 3 +- logback-site/src/site/pages/manual/filters.html | 45 ++++++++--- logback-site/src/site/pages/news.html | 10 ++- 11 files changed, 170 insertions(+), 77 deletions(-) copy logback-access/src/test/java/ch/qos/logback/access/{net/URLEvaluatorTest.java => boolex/JaninoEventEvaluatorTest.java} (51%) copy logback-access/src/test/java/ch/qos/logback/access/{filter => boolex}/PackageTest.java (88%) 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.27-22-gb3b234d
by git-noreply＠pixie.qos.ch 24 Jan '11

24 Jan '11

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 b3b234ddef5a1ba6863cd922f4f410cde65c1a0d (commit) from d411638322b2a2291ac1c85e5a596aeb16c8de64 (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=b3b234ddef5a1ba6863cd922… http://github.com/ceki/logback/commit/b3b234ddef5a1ba6863cd922f4f410cde65c1… commit b3b234ddef5a1ba6863cd922f4f410cde65c1a0d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Jan 24 23:19:36 2011 +0100 minor refactoring diff --git a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy index 7736256..c4be351 100644 --- a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy +++ b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy @@ -29,7 +29,7 @@ class GafferConfigurator { } protected void informContextOfURLUsedForConfiguration(URL url) { - ConfigurationWatchListUtil.updateWatchList(context, url); + ConfigurationWatchListUtil.setMainWatchURL(context, url); } void run(URL url) { diff --git a/logback-classic/src/test/input/turbo/scan_lbclassic154.xml b/logback-classic/src/test/input/turbo/scan_lbclassic154.xml index 0980beb..735c54c 100644 --- a/logback-classic/src/test/input/turbo/scan_lbclassic154.xml +++ b/logback-classic/src/test/input/turbo/scan_lbclassic154.xml @@ -1,5 +1,3 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE configuration> <configuration scan="true" scanPeriod="50 millisecond"> 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 ee96b45..67a534f 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 @@ -19,6 +19,7 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; +import java.util.Random; import ch.qos.logback.classic.gaffer.GafferConfigurator; import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; @@ -49,13 +50,25 @@ public class ReconfigureOnChangeTest { // the space in the file name mandated by // http://jira.qos.ch/browse/LBCORE-119 final static String SCAN1_FILE_AS_STR = ClassicTestConstants.INPUT_PREFIX - + "turbo/scan 1.xml"; + + "turbo/scan 1.xml"; - final static String G_SCAN1_FILE_AS_STR = ClassicTestConstants.INPUT_PREFIX - + "turbo/scan 1.groovy"; + final static String G_SCAN1_FILE_AS_STR = ClassicTestConstants.INPUT_PREFIX + + "turbo/scan 1.groovy"; final static String SCAN_LBCLASSIC_154_FILE_AS_STR = ClassicTestConstants.INPUT_PREFIX - + "turbo/scan_lbclassic154.xml"; + + "turbo/scan_lbclassic154.xml"; + + final static String INCLUSION_SCAN_TOPLEVEL0_AS_STR = ClassicTestConstants.INPUT_PREFIX + + "turbo/inclusion/topLevel0.xml"; + + final static String INCLUSION_SCAN_TOP_BY_RESOURCE_AS_STR = ClassicTestConstants.INPUT_PREFIX + + "turbo/inclusion/topByResource.xml"; + + + final static String INCLUSION_SCAN_INNER0_AS_STR = ClassicTestConstants.INPUT_PREFIX + + "turbo/inclusion/inner0.xml"; + + final static String INCLUSION_SCAN_INNER1_AS_STR = "target/test-classes/asResource/inner1.xml"; // it actually takes time for Windows to propagate file modification changes // values below 100 milliseconds can be problematic the same propagation @@ -72,7 +85,7 @@ public class ReconfigureOnChangeTest { @Before public void setUp() { - System.out.println("======== TEST START, time"+System.currentTimeMillis()); + System.out.println("======== TEST START, time" + System.currentTimeMillis()); // take into account propagation latency occurs on Linux or Mac if (Env.isLinux() || Env.isMac()) { sleepBetweenUpdates = 950; @@ -109,22 +122,57 @@ public class ReconfigureOnChangeTest { } - // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter - @Test - public void scan1() throws JoranException, IOException, InterruptedException { - File file = new File(SCAN1_FILE_AS_STR); - configure(file); - RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); + void doScanTest(File topLevelFile, File fileToTouch) throws JoranException, IOException, InterruptedException { + configure(topLevelFile); + RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(fileToTouch); harness.execute(runnableArray); loggerContext.getStatusManager().add( - new InfoStatus("end of execution ", this)); + new InfoStatus("end of execution ", this)); long expectedReconfigurations = runnableArray[0].getCounter(); verify(expectedReconfigurations); + } - @Test + // chose a test at random. These tests are rather long... + // check for deadlocks + @Test(timeout = 20000) + public void randomTest() throws JoranException, IOException, InterruptedException { + Random rand = new Random(System.currentTimeMillis()); + switch(rand.nextInt(5)) { + case 0: scan1(); + break; + case 1: scanWithFileInclusion(); + break; + case 2: scanWithResourceInclusion(); + break; + case 3: scan_lbclassic154(); + break; + case 4: gscan1(); + break; + } + } + + // Tests whether ConfigurationAction is installing ReconfigureOnChangeFilter + public void scan1() throws JoranException, IOException, InterruptedException { + File file = new File(SCAN1_FILE_AS_STR); + doScanTest(file, file); + } + + public void scanWithFileInclusion() throws JoranException, IOException, InterruptedException { + File topLevelFile = new File(INCLUSION_SCAN_TOPLEVEL0_AS_STR); + File innerFile = new File(INCLUSION_SCAN_INNER0_AS_STR); + doScanTest(topLevelFile, innerFile); + } + + public void scanWithResourceInclusion() throws JoranException, IOException, InterruptedException { + File topLevelFile = new File(INCLUSION_SCAN_TOP_BY_RESOURCE_AS_STR); + File innerFile = new File(INCLUSION_SCAN_INNER1_AS_STR); + doScanTest(topLevelFile, innerFile); + } + + public void gscan1() throws JoranException, IOException, InterruptedException { File file = new File(G_SCAN1_FILE_AS_STR); gConfigure(file); @@ -132,45 +180,46 @@ public class ReconfigureOnChangeTest { harness.execute(runnableArray); loggerContext.getStatusManager().add( - new InfoStatus("end of execution ", this)); + new InfoStatus("end of execution ", this)); long expectedRreconfigurations = runnableArray[0].getCounter(); verify(expectedRreconfigurations); } // check for deadlocks - @Test(timeout = 20000) + //Attr_Test(timeout = 20000) public void scan_lbclassic154() throws JoranException, IOException, - InterruptedException { + InterruptedException { File file = new File(SCAN_LBCLASSIC_154_FILE_AS_STR); configure(file); RunnableWithCounterAndDone[] runnableArray = buildRunnableArray(file); harness.execute(runnableArray); loggerContext.getStatusManager().add( - new InfoStatus("end of execution ", this)); + new InfoStatus("end of execution ", this)); long expectedReconfigurations = runnableArray[0].getCounter(); verify(expectedReconfigurations); } + void verify(long expectedReconfigurations) { StatusChecker checker = new StatusChecker(loggerContext); StatusPrinter.print(loggerContext); assertTrue(checker.isErrorFree()); int effectiveResets = checker - .matchCount("Resetting and reconfiguring context"); + .matchCount("Resetting and reconfiguring context"); // the number of effective resets must be equal or less than // expectedReconfigurations assertTrue(effectiveResets <= expectedReconfigurations); // however, there should be some effective resets String failMsg = "effective=" + effectiveResets + ", expected=" - + expectedReconfigurations; + + expectedReconfigurations; // we can't have the test succeed under JDK 1.5, punt and require 1.6+ if (Env.isJDK6OrHigher()) { assertTrue(failMsg, - (effectiveResets * 1.5) >= (expectedReconfigurations * 1.0)); + (effectiveResets * 1.5) >= (expectedReconfigurations * 1.0)); } } @@ -178,7 +227,7 @@ public class ReconfigureOnChangeTest { ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter(); rocf.setContext(loggerContext); File file = new File(SCAN1_FILE_AS_STR); - ConfigurationWatchListUtil.updateWatchList(loggerContext, file.toURI().toURL()); + ConfigurationWatchListUtil.setMainWatchURL(loggerContext, file.toURI().toURL()); rocf.start(); return rocf; } 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 8f16313..afdcb0b 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 @@ -86,7 +86,7 @@ public abstract class GenericConfigurator extends ContextAwareBase { } protected void informContextOfURLUsedForConfiguration(URL url) { - ConfigurationWatchListUtil.updateWatchList(context, url); + ConfigurationWatchListUtil.setMainWatchURL(context, url); } final public void doConfigure(InputStream inputStream) throws JoranException { diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java index befbdc3..4e91506 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/IncludeAction.java @@ -13,13 +13,16 @@ */ package ch.qos.logback.core.joran.action; +import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; import java.util.List; +import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; import org.xml.sax.Attributes; import ch.qos.logback.core.joran.event.SaxEvent; @@ -41,7 +44,7 @@ public class IncludeAction extends Action { @Override public void begin(InterpretationContext ec, String name, Attributes attributes) - throws ActionException { + throws ActionException { SaxEventRecorder recorder = new SaxEventRecorder(); @@ -105,7 +108,7 @@ public class IncludeAction extends Action { return true; } throw new IllegalStateException("Count value [" + count - + "] is not expected"); + + "] is not expected"); } private InputStream getInputStreamByFilePath(String pathToFile) { @@ -118,15 +121,17 @@ public class IncludeAction extends Action { } } - private InputStream getInputStreamByUrl(String urlAttribute) { - URL url; + URL attributeToURL(String urlAttribute) { try { - url = new URL(urlAttribute); + return new URL(urlAttribute); } catch (MalformedURLException mue) { String errMsg = "URL [" + urlAttribute + "] is not well formed."; addError(errMsg, mue); return null; } + } + + private InputStream getInputStreamByUrl(URL url) { return openURL(url); } @@ -140,38 +145,63 @@ public class IncludeAction extends Action { } } - private InputStream getInputStreamByResource(String resourceAttribute) { + URL resourceAsURL(String resourceAttribute) { URL url = Loader.getResourceBySelfClassLoader(resourceAttribute); if (url == null) { String errMsg = "Could not find resource corresponding to [" - + resourceAttribute + "]"; + + resourceAttribute + "]"; addError(errMsg); return null; + } else + return url; + } + + URL filePathAsURL(String path) { + URI uri = new File(path).toURI(); + try { + return uri.toURL(); + } catch (MalformedURLException e) { + // impossible to get here + e.printStackTrace(); + return null; } + } + + private InputStream getInputStreamByResource(URL url) { return openURL(url); } - InputStream getInputStream(InterpretationContext ec, Attributes attributes) { + URL getInputURL(InterpretationContext ec, Attributes attributes) { String fileAttribute = attributes.getValue(FILE_ATTR); String urlAttribute = attributes.getValue(URL_ATTR); String resourceAttribute = attributes.getValue(RESOURCE_ATTR); if (!OptionHelper.isEmpty(fileAttribute)) { - attributeInUse = ec.subst(fileAttribute); - return getInputStreamByFilePath(attributeInUse); + this.attributeInUse = ec.subst(fileAttribute); + return filePathAsURL(attributeInUse); } if (!OptionHelper.isEmpty(urlAttribute)) { - attributeInUse = ec.subst(urlAttribute); - return getInputStreamByUrl(attributeInUse); + this.attributeInUse = ec.subst(urlAttribute); + return attributeToURL(attributeInUse); } if (!OptionHelper.isEmpty(resourceAttribute)) { - attributeInUse = ec.subst(resourceAttribute); - return getInputStreamByResource(attributeInUse); + this.attributeInUse = ec.subst(resourceAttribute); + return resourceAsURL(attributeInUse); } // given previous checkAttributes() check we cannot reach this line - throw new IllegalStateException("A input stream should have been returned"); + throw new IllegalStateException("A URL stream should have been returned"); + + } + + InputStream getInputStream(InterpretationContext ec, Attributes attributes) { + URL inputURL = getInputURL(ec, attributes); + if(inputURL == null) + return null; + + ConfigurationWatchListUtil.addToWatchList(context, inputURL); + return openURL(inputURL); } private void trimHeadAndTail(SaxEventRecorder recorder) { @@ -196,7 +226,7 @@ public class IncludeAction extends Action { } private void parseAndRecord(InputStream inputSource, SaxEventRecorder recorder) - throws JoranException { + throws JoranException { recorder.setContext(context); recorder.recordEvents(inputSource); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java index 953f890..996058d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java @@ -37,7 +37,7 @@ public class ConfigurationWatchList extends ContextAwareBase { } } - void addToWatchList(URL url) { + public void addToWatchList(URL url) { addAsFileToWatch(url); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java index 278e5f4..44399e2 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java @@ -3,7 +3,15 @@ package ch.qos.logback.core.joran.util; import ch.qos.logback.core.Context; import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.spi.ConfigurationWatchList; +import ch.qos.logback.core.status.InfoStatus; +import ch.qos.logback.core.status.Status; +import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.status.WarnStatus; +import javax.security.auth.login.Configuration; +import java.io.File; +import java.net.MalformedURLException; +import java.net.URI; import java.net.URL; /** @@ -11,10 +19,14 @@ import java.net.URL; */ public class ConfigurationWatchListUtil { + final static ConfigurationWatchListUtil origin = new ConfigurationWatchListUtil(); - public static void updateWatchList(Context context, URL url) { + private ConfigurationWatchListUtil() { + } + + public static void setMainWatchURL(Context context, URL url) { ConfigurationWatchList cwl = getConfigurationWatchList(context); - if(cwl == null) { + if (cwl == null) { cwl = new ConfigurationWatchList(); cwl.setContext(context); context.putObject(CoreConstants.CONFIGURATION_WATCH_LIST, cwl); @@ -24,7 +36,35 @@ public class ConfigurationWatchListUtil { cwl.setMainURL(url); } - public static ConfigurationWatchList getConfigurationWatchList(Context context) { - return (ConfigurationWatchList) context.getObject(CoreConstants.CONFIGURATION_WATCH_LIST); + public static void addToWatchList(Context context, URL url) { + ConfigurationWatchList cwl = getConfigurationWatchList(context); + if (cwl == null) { + addWarn(context, "Null ConfigurationWatchList. Cannot add " + url); + } else { + addInfo(context, "Adding [" + url + "] to configuration watch list."); + cwl.addToWatchList(url); + } + } + + public static ConfigurationWatchList getConfigurationWatchList(Context context) { + return (ConfigurationWatchList) context.getObject(CoreConstants.CONFIGURATION_WATCH_LIST); + } + + static void addStatus(Context context, Status s) { + if (context == null) { + System.out.println("Null context in " + ConfigurationWatchList.class.getName()); + return; + } + StatusManager sm = context.getStatusManager(); + if (sm == null) return; + sm.add(s); + } + + static void addInfo(Context context, String msg) { + addStatus(context, new InfoStatus(msg, origin)); + } + + static void addWarn(Context context, String msg) { + addStatus(context, new WarnStatus(msg, origin)); } } diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index fd6ee67..af19296 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -60,6 +60,10 @@ href="manual/appenders.html#uniquelyNamed"><code><timestamp></code></a> element in configuration files.</p> + <p>Logback can now scan for included files as well. This solves <a + href="http://jira.qos.ch/browse/LBCLASSIC-245">LBCLASSIC-245</a>. + </p> + <hr width="80%" align="center" /> <h3>December 22nd, 2010 - Release of version 0.9.27</h3> ----------------------------------------------------------------------- Summary of changes: .../classic/gaffer/GafferConfigurator.groovy | 2 +- .../src/test/input/turbo/scan_lbclassic154.xml | 2 - .../classic/turbo/ReconfigureOnChangeTest.java | 91 +++++++++++++++----- .../logback/core/joran/GenericConfigurator.java | 2 +- .../logback/core/joran/action/IncludeAction.java | 62 ++++++++++---- .../core/joran/spi/ConfigurationWatchList.java | 2 +- .../joran/util/ConfigurationWatchListUtil.java | 48 ++++++++++- logback-site/src/site/pages/news.html | 4 + 8 files changed, 167 insertions(+), 46 deletions(-) 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.27-21-gd411638
by git-noreply＠pixie.qos.ch 24 Jan '11

24 Jan '11

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 d411638322b2a2291ac1c85e5a596aeb16c8de64 (commit) from 3c12be5cf378d4ab92d182e1a539132cfa13d6cb (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=d411638322b2a2291ac1c85e… http://github.com/ceki/logback/commit/d411638322b2a2291ac1c85e5a596aeb16c8d… commit d411638322b2a2291ac1c85e5a596aeb16c8de64 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Jan 24 22:44:17 2011 +0100 fixing LBCLASSIC-245 diff --git a/logback-classic/src/test/input/turbo/inclusion/inner0.xml b/logback-classic/src/test/input/turbo/inclusion/inner0.xml new file mode 100644 index 0000000..feeab30 --- /dev/null +++ b/logback-classic/src/test/input/turbo/inclusion/inner0.xml @@ -0,0 +1,3 @@ +<included> + <root level="ERROR"/> +</included> diff --git a/logback-classic/src/test/input/turbo/inclusion/topByResource.xml b/logback-classic/src/test/input/turbo/inclusion/topByResource.xml new file mode 100644 index 0000000..82f5590 --- /dev/null +++ b/logback-classic/src/test/input/turbo/inclusion/topByResource.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE x> + + +<configuration scan="true" scanPeriod="50 millisecond"> + <include resource="asResource/inner1.xml"/> +</configuration> + diff --git a/logback-classic/src/test/input/turbo/inclusion/topLevel0.xml b/logback-classic/src/test/input/turbo/inclusion/topLevel0.xml new file mode 100644 index 0000000..48ac9f7 --- /dev/null +++ b/logback-classic/src/test/input/turbo/inclusion/topLevel0.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE configuration> + +<configuration scan="true" scanPeriod="50 millisecond"> + + <include file="src/test/input/turbo/inclusion/inner0.xml"/> + +</configuration> + \ No newline at end of file diff --git a/logback-classic/src/test/resources/asResource/inner1.xml b/logback-classic/src/test/resources/asResource/inner1.xml new file mode 100644 index 0000000..feeab30 --- /dev/null +++ b/logback-classic/src/test/resources/asResource/inner1.xml @@ -0,0 +1,3 @@ +<included> + <root level="ERROR"/> +</included> ----------------------------------------------------------------------- Summary of changes: .../src/test/input/turbo/inclusion/inner0.xml | 3 +++ .../{scan 1.xml => inclusion/topByResource.xml} | 9 ++++----- .../turbo/{scan 1.xml => inclusion/topLevel0.xml} | 2 +- .../src/test/resources/asResource/inner1.xml | 3 +++ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 logback-classic/src/test/input/turbo/inclusion/inner0.xml copy logback-classic/src/test/input/turbo/{scan 1.xml => inclusion/topByResource.xml} (63%) copy logback-classic/src/test/input/turbo/{scan 1.xml => inclusion/topLevel0.xml} (67%) create mode 100644 logback-classic/src/test/resources/asResource/inner1.xml hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-244) Stack overflow with tomcat7/juli adapter
by Eric Estievenart (JIRA) 24 Jan '11

24 Jan '11

Stack overflow with tomcat7/juli adapter ---------------------------------------- Key: LBCLASSIC-244 URL: http://jira.qos.ch/browse/LBCLASSIC-244 Project: logback-classic Issue Type: Bug Components: Other Affects Versions: 0.9.27 Environment: tomcat 7.0.6 sun j2se 1.6.0_21-b06 Debian Linux x86 2.6.36 Reporter: Eric Estievenart Assignee: Logback dev list You may want to be aware of the following stack overflow while experimenting the new juli-to-slf adapter on git: ..... at org.apache.juli.logging.SLF4JLog.info(SLF4JLog.java:146) at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1531) // Log access to stopped classloader if (!started) { try { throw new IllegalStateException(); } catch (IllegalStateException e) { log.info(sm.getString("webappClassLoader.stopped", name), e); <<<<<<<<<< } } at org.apache.catalina.loader.WebappClassLoader.loadClass(WebappClassLoader.java:1488) public Class<?> loadClass(String name) throws ClassNotFoundException { return (loadClass(name, false)); } at ch.qos.logback.classic.spi.PackagingDataCalculator.loadClass(PackagingDataCalculator.java:198) at ch.qos.logback.classic.spi.PackagingDataCalculator.bestEffortLoadClass(PackagingDataCalculator.java:226) at ch.qos.logback.classic.spi.PackagingDataCalculator.computeBySTEP(PackagingDataCalculator.java:132) at ch.qos.logback.classic.spi.PackagingDataCalculator.populateUncommonFrames(PackagingDataCalculator.java:107) at ch.qos.logback.classic.spi.PackagingDataCalculator.populateFrames(PackagingDataCalculator.java:99) at ch.qos.logback.classic.spi.PackagingDataCalculator.calculate(PackagingDataCalculator.java:58) at ch.qos.logback.classic.spi.ThrowableProxy.calculatePackagingData(ThrowableProxy.java:100) at ch.qos.logback.classic.spi.LoggingEvent.<init>(LoggingEvent.java:126) at ch.qos.logback.classic.Logger.buildLoggingEventAndAppend(Logger.java:471) at ch.qos.logback.classic.Logger.filterAndLog_0_Or3Plus(Logger.java:427) at ch.qos.logback.classic.Logger.info(Logger.java:647) at org.apache.juli.logging.SLF4JLog.info(SLF4JLog.java:146) ... I tought that Loggers were protected against reentrancy, but this is rather at the appender level that the reentrancy flag is set/tested. Globally the setup is: slf4j api 1.6.1, logback core and classic (0.9.27), juli-over-slf4j.jar (build from git) in tomcat/bin, with tomcat/bin/setenv.sh setting the classpath to these jars. I don't yet understand why the tomcat classloader was not started; maybe because of a context reload. I'll dig a bit more into that... -- 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

1 0

[JIRA] Created: (LBACCESS-23) Access logging does not work with syslog appender
by Stein Inge Morisbak (JIRA) 24 Jan '11

24 Jan '11

Access logging does not work with syslog appender ------------------------------------------------- Key: LBACCESS-23 URL: http://jira.qos.ch/browse/LBACCESS-23 Project: logback-access Issue Type: Bug Reporter: Stein Inge Morisbak Assignee: Logback dev list The ch.qos.logback.access.spi.AccessEvent does not implement ch.qos.logback.classic.spi.ILoggingEvent, so if you try to log access log to syslog you get a ClassCastException during the append(E eventObject) of class SyslogAppenderBase which SyslogAppender inherits from. The actual ClassCastException happens when calling Converter.write(buf, event) in the writeLoopOnConverters(E event) method of class PatternLayoutBase<E> which uses the convert(ILoggingEvent event) method of the SyslogStartConverter which you can see expects an ILoggingEvent. -- 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

[JIRA] Created: (LBCLASSIC-243) Scribe Appender
by Gordon Sims (JIRA) 21 Jan '11

21 Jan '11

Scribe Appender --------------- Key: LBCLASSIC-243 URL: http://jira.qos.ch/browse/LBCLASSIC-243 Project: logback-classic Issue Type: New Feature Components: appender Reporter: Gordon Sims Assignee: Logback dev list (posting on behalf of colleague Derek Libby) We have written a ScribeAppender for internal use at ITA Software which we would like to give back to the Logback project. The starting point for this appender was the log4j ScribeAppender documented at: https://github.com/pnayak/Scribe-logback-Appender/blob/master/src/java/org/… The appender currently accepts the following configuration settings: host - The host name on which the Scribe server is running port - The port on which the Scribe server is listening category - The category name to use when publishing to Scribe bucketSize - The number of messages to accumulate before publishing to Scribe connectInterval - The number of milliseconds to wait between reconnect attempts when connection is lost. The appender is blocked during this time Issues: The most obvious issue to me is the new dependencies this appender introduces on the scribe, thrift and fb303 jars. To my knowledge these are not available in any of the public maven repositories. Details on how I built these dependences in house are attached to this mail. Because they are not readily available adding them as dependencies to logback-classic is probably to burdensome. Perhaps creating a logback-extras or even a logback-scribe jar for people to use if they so choose is the way to go. The fact that logback encoders require a stream to which to output the results of their formatting was a bit of a pain point. I worked around this by passing a ByteArrayOutputStream to the appenders configured encoder and then extracting the results from it after then encode step is completed. I also have to check for and remove newlines from encoded log lines as there is no need for them when publishing messges to Scribe. We have been using this encoder on a couple of data center machines for about a month now with no ill effects. -- Instructions for building the jars necessary for Java to communicate with a scribe server: Install Thrift: Download the thrift tarball from http://thrift.apache.org/download/ tar -xzf thrift-0.5.0.tar.gz # Order seemed to matter with the next two lines sudo apt-get install libboost-test1.40-dev libevent-dev automake libtool flex bison pkg-config g++ sudo apt-get install libboost-dev sudo apt-get install php5-dev sudo apt-get install python-dev cd $THRIFT_HOME ./configure make sudo make install Build thrift jars cd $THRIFT_HOME/lib/java ant cd $THRIFT_HOME/contrib/fb303/java ant Build scribe classes cd $SCRIBE_ROOT/if # Add: # include "/path/to/your/thrift/contrib/fb303/if/fb303.thrift" # to $SCRIBE_HOME/if/scribe.thrift thrift --gen java scribe.thrift -- 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

1 1

[JIRA] Created: (LBGENERAL-44) Enable wiki renderer for JIRA projects
by Stevo Slavic (JIRA) 20 Jan '11

20 Jan '11

Enable wiki renderer for JIRA projects -------------------------------------- Key: LBGENERAL-44 URL: http://jira.qos.ch/browse/LBGENERAL-44 Project: logback-general Issue Type: Improvement Reporter: Stevo Slavic Assignee: Logback dev list Please enable wiki renderer for JIRA projects. This renderer would allow users to create better readable issues. See following JIRA doc for more details on the feature: http://confluence.atlassian.com/display/JIRA/Configuring+Rich-Text+Renderers -- 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

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.27-20-g3c12be5
by git-noreply＠pixie.qos.ch 18 Jan '11

18 Jan '11

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 3c12be5cf378d4ab92d182e1a539132cfa13d6cb (commit) from 7fbeda0f115752a2042515c83f4fd77a7077527f (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=3c12be5cf378d4ab92d182e1… http://github.com/ceki/logback/commit/3c12be5cf378d4ab92d182e1a539132cfa13d… commit 3c12be5cf378d4ab92d182e1a539132cfa13d6cb Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Jan 18 18:06:47 2011 +0100 adding support for watching multiple files in ReconfigureOnChangeFilter diff --git a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy index 3d7811c..7736256 100644 --- a/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy +++ b/logback-classic/src/main/groovy/ch/qos/logback/classic/gaffer/GafferConfigurator.groovy @@ -15,7 +15,8 @@ package ch.qos.logback.classic.gaffer import ch.qos.logback.classic.LoggerContext import ch.qos.logback.core.util.ContextUtil -import ch.qos.logback.core.CoreConstants + +import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil class GafferConfigurator { @@ -28,7 +29,7 @@ class GafferConfigurator { } protected void informContextOfURLUsedForConfiguration(URL url) { - context.putObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN, url); + ConfigurationWatchListUtil.updateWatchList(context, url); } void run(URL url) { 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 e72d4b3..5af7435 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,19 +15,18 @@ package ch.qos.logback.classic.turbo; import java.io.File; import java.net.URL; -import java.net.URLDecoder; +import java.util.List; import ch.qos.logback.classic.gaffer.GafferUtil; import ch.qos.logback.classic.util.EnvUtil; -import ch.qos.logback.core.status.ErrorStatus; -import ch.qos.logback.core.status.StatusManager; +import ch.qos.logback.core.joran.spi.ConfigurationWatchList; +import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; import org.slf4j.Marker; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.joran.JoranConfigurator; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.spi.FilterReply; import ch.qos.logback.core.status.InfoStatus; @@ -49,42 +48,26 @@ public class ReconfigureOnChangeFilter extends TurboFilter { public final static long DEFAULT_REFRESH_PERIOD = 60 * 1000; long refreshPeriod = DEFAULT_REFRESH_PERIOD; - File fileToScan; - protected long nextCheck; - volatile long lastModified; + URL mainConfigurationURL; + protected volatile long nextCheck; - Object lock = new Object(); + ConfigurationWatchList cwl; @Override public void start() { - URL url = (URL) context - .getObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN); - if (url != null) { - fileToScan = convertToFile(url); - if (fileToScan != null) { - synchronized (lock) { - long inSeconds = refreshPeriod / 1000; - addInfo("Will scan for changes in file [" + fileToScan + "] every " - + inSeconds + " seconds. "); - lastModified = fileToScan.lastModified(); - updateNextCheck(System.currentTimeMillis()); - } - super.start(); + cwl = ConfigurationWatchListUtil.getConfigurationWatchList(context); + if (cwl != null) { + mainConfigurationURL = cwl.getMainURL(); + List<File> watchList = cwl.getCopyOfFileWatchList(); + long inSeconds = refreshPeriod / 1000; + addInfo("Will scan for changes in [" + watchList + "] every " + + inSeconds + " seconds. "); + synchronized (cwl) { + updateNextCheck(System.currentTimeMillis()); } - } else { - addError("Could not find URL of file to scan."); - } - } - - @SuppressWarnings("deprecation") - File convertToFile(URL url) { - String protocol = url.getProtocol(); - if ("file".equals(protocol)) { - File file = new File(URLDecoder.decode(url.getFile())); - return file; - } else { - addError("URL [" + url + "] is not of type file"); - return null; + super.start(); + } else { + addWarn("Empty ConfigurationWatchList in context"); } } @@ -108,12 +91,14 @@ public class ReconfigureOnChangeFilter extends TurboFilter { return FilterReply.NEUTRAL; } - //System.out.println("."); - synchronized (lock) { - boolean changed = changeDetected(); - if (changed) { + synchronized (cwl) { + if (changeDetected()) { + // Even though reconfiguration involves resetting the loggerContext, + // which clears the list of turbo filters including this instance, it is + // still possible for this instance to be subsequently invoked by another + // thread if it was already executing when the context was reset. + disableSubsequentReconfiguration(); detachReconfigurationToNewThread(); - } } @@ -123,14 +108,8 @@ public class ReconfigureOnChangeFilter extends TurboFilter { // by detaching reconfiguration to a new thread, we release the various // locks held by the current thread, in particular, the AppenderAttachable // reader lock. - private void detachReconfigurationToNewThread() { - // Even though this method resets the loggerContext, which clears the - // list of turbo filters including this instance, it is still possible - // for this instance to be subsequently invoked by another thread if it - // was already executing when the context was reset. - disableSubsequentRecofiguration(); - addInfo("Detected change in [" + fileToScan + "]"); + addInfo("Detected change in [" + cwl.getCopyOfFileWatchList() + "]"); addInfo("Resetting and reconfiguring context [" + context.getName() + "]"); new ReconfiguringThread().start(); } @@ -139,23 +118,17 @@ public class ReconfigureOnChangeFilter extends TurboFilter { nextCheck = now + refreshPeriod; } - // This method is synchronized to prevent near-simultaneous re-configurations - protected boolean changeDetected() { long now = System.currentTimeMillis(); if (now >= nextCheck) { updateNextCheck(now); - return (lastModified != fileToScan.lastModified() && lastModified != SENTINEL); + return cwl.changeDetected(); } return false; } - String currentThreadName() { - return Thread.currentThread().getName(); - } - - void disableSubsequentRecofiguration() { - lastModified = SENTINEL; + void disableSubsequentReconfiguration() { + nextCheck = Long.MAX_VALUE; } public long getRefreshPeriod() { @@ -169,22 +142,21 @@ public class ReconfigureOnChangeFilter extends TurboFilter { class ReconfiguringThread extends Thread { public void run() { LoggerContext lc = (LoggerContext) context; - - if (fileToScan.toString().endsWith("groovy")) { + if (mainConfigurationURL.toString().endsWith("groovy")) { if (EnvUtil.isGroovyAvailable()) { lc.reset(); // avoid directly referring to GafferConfigurator so as to avoid // loading groovy.lang.GroovyObject . See also http://jira.qos.ch/browse/LBCLASSIC-214 - GafferUtil.runGafferConfiguratorOn(lc, this, fileToScan); + GafferUtil.runGafferConfiguratorOn(lc, this, mainConfigurationURL); } else { addError("Groovy classes are not available on the class path. ABORTING INITIALIZATION."); } - } else if (fileToScan.toString().endsWith("xml")) { + } else if (mainConfigurationURL.toString().endsWith("xml")) { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(context); lc.reset(); try { - jc.doConfigure(fileToScan); + jc.doConfigure(mainConfigurationURL); lc.getStatusManager().add( new InfoStatus("done resetting the logging context", this)); } catch (JoranException e) { 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 4fbbf58..36e86af 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 @@ -295,7 +295,7 @@ public class JoranConfiguratorTest { logger.debug("after " + i); } - // StatusPrinter.print(loggerContext); + StatusPrinter.print(loggerContext); StatusChecker checker = new StatusChecker(loggerContext); assertTrue(checker.isErrorFree()); assertTrue(checker.containsMatch("Resetting and reconfiguring context")); 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 d1e472c..ee96b45 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 @@ -19,9 +19,9 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; -import java.net.URL; import ch.qos.logback.classic.gaffer.GafferConfigurator; +import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -108,15 +108,6 @@ public class ReconfigureOnChangeTest { return rArray; } - @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 @Test @@ -187,8 +178,7 @@ public class ReconfigureOnChangeTest { ReconfigureOnChangeFilter rocf = new ReconfigureOnChangeFilter(); rocf.setContext(loggerContext); File file = new File(SCAN1_FILE_AS_STR); - loggerContext.putObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN, - file.toURI().toURL()); + ConfigurationWatchListUtil.updateWatchList(loggerContext, file.toURI().toURL()); rocf.start(); return rocf; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java index 181da69..0989645 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java +++ b/logback-core/src/main/java/ch/qos/logback/core/CoreConstants.java @@ -110,9 +110,7 @@ public class CoreConstants { static public final String SEE_FNP_NOT_SET = "See also http://logback.qos.ch/codes.html#tbr_fnp_not_set"; - // The url used for the last configuration via Joran. If a file is used for the - // configuration, then file.getURL() is registered - public static String URL_OF_LAST_CONFIGURATION_VIA_JORAN = "URL_OF_LAST_CONFIGURATION_VIA_JORAN"; + public static String CONFIGURATION_WATCH_LIST = "CONFIGURATION_WATCH_LIST"; /** 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 be9f466..8f16313 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 @@ -21,9 +21,9 @@ import java.net.URL; import java.net.URLConnection; import java.util.List; +import ch.qos.logback.core.joran.util.ConfigurationWatchListUtil; import org.xml.sax.InputSource; -import ch.qos.logback.core.CoreConstants; import ch.qos.logback.core.joran.event.SaxEvent; import ch.qos.logback.core.joran.event.SaxEventRecorder; import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry; @@ -86,9 +86,9 @@ public abstract class GenericConfigurator extends ContextAwareBase { } protected void informContextOfURLUsedForConfiguration(URL url) { - getContext().putObject(CoreConstants.URL_OF_LAST_CONFIGURATION_VIA_JORAN, url); + ConfigurationWatchListUtil.updateWatchList(context, url); } - + final public void doConfigure(InputStream inputStream) throws JoranException { doConfigure(new InputSource(inputStream)); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java new file mode 100644 index 0000000..953f890 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java @@ -0,0 +1,76 @@ +package ch.qos.logback.core.joran.spi; + + +import ch.qos.logback.core.spi.ContextAwareBase; + +import java.io.File; +import java.net.URL; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.List; + +/** + * @author Ceki Gücü + */ +public class ConfigurationWatchList extends ContextAwareBase { + + URL mainURL; + List<File> fileWatchList = new ArrayList<File>(); + List<Long> lastModifiedList = new ArrayList<Long>(); + + public void clear() { + this.mainURL = null; + lastModifiedList.clear(); + fileWatchList.clear(); + } + + public void setMainURL(URL mainURL) { + this.mainURL = mainURL; + addAsFileToWatch(mainURL); + } + + private void addAsFileToWatch(URL url) { + File file = convertToFile(url); + if (file != null) { + fileWatchList.add(file); + lastModifiedList.add(file.lastModified()); + } + } + + void addToWatchList(URL url) { + addAsFileToWatch(url); + } + + public URL getMainURL() { + return mainURL; + } + + public List<File> getCopyOfFileWatchList() { + return new ArrayList<File>(fileWatchList); + } + public boolean changeDetected() { + int len = fileWatchList.size(); + for (int i = 0; i < len; i++) { + long lastModified = lastModifiedList.get(i); + File file = fileWatchList.get(i); + if (lastModified != file.lastModified()) { + return true; + } + } + return false; + //return (lastModified != fileToScan.lastModified() && lastModified != SENTINEL); + } + + @SuppressWarnings("deprecation") + File convertToFile(URL url) { + String protocol = url.getProtocol(); + if ("file".equals(protocol)) { + File file = new File(URLDecoder.decode(url.getFile())); + return file; + } else { + addError("URL [" + url + "] is not of type file"); + return null; + } + } + +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java new file mode 100644 index 0000000..278e5f4 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java @@ -0,0 +1,30 @@ +package ch.qos.logback.core.joran.util; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.CoreConstants; +import ch.qos.logback.core.joran.spi.ConfigurationWatchList; + +import java.net.URL; + +/** + * @author Ceki Gücü + */ +public class ConfigurationWatchListUtil { + + + public static void updateWatchList(Context context, URL url) { + ConfigurationWatchList cwl = getConfigurationWatchList(context); + if(cwl == null) { + cwl = new ConfigurationWatchList(); + cwl.setContext(context); + context.putObject(CoreConstants.CONFIGURATION_WATCH_LIST, cwl); + } else { + cwl.clear(); + } + cwl.setMainURL(url); + } + + public static ConfigurationWatchList getConfigurationWatchList(Context context) { + return (ConfigurationWatchList) context.getObject(CoreConstants.CONFIGURATION_WATCH_LIST); + } +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/spi/ConfigurationWatchListTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/spi/ConfigurationWatchListTest.java new file mode 100644 index 0000000..40031fc --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/spi/ConfigurationWatchListTest.java @@ -0,0 +1,25 @@ +package ch.qos.logback.core.joran.spi; + +import org.junit.Test; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; + +import static org.junit.Assert.assertEquals; + +/** + * @author Ceki Gücü + */ +public class ConfigurationWatchListTest { + + @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(); + ConfigurationWatchList cwl = new ConfigurationWatchList(); + File back = cwl.convertToFile(url); + assertEquals(file.getName(), back.getName()); + } +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java index 92bd15a..66286cd 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/spi/PackageTest.java @@ -19,7 +19,7 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) @SuiteClasses( { PatternTest.class, SimpleRuleStoreTest.class, - NoAutoStartUtilTest.class, + NoAutoStartUtilTest.class, ConfigurationWatchListTest.class, DefaultNestedComponentRegistryTest.class, CaseCombinatorTest.class }) public class PackageTest { } diff --git a/logback-site/src/site/pages/codes.html b/logback-site/src/site/pages/codes.html index 72d04d1..e80c770 100644 --- a/logback-site/src/site/pages/codes.html +++ b/logback-site/src/site/pages/codes.html @@ -370,8 +370,9 @@ href="http://technet.microsoft.com/en-us/sysinternals/bb896653">Process Explorer</a> can help you locate the processes which reference a given file (Find -> Find Handle or DLL). On Linux, you can use - the <a href="http://www.manpagez.com/man/8/lsof/">lsof</a> command - to find which process has a file open.</p> + the <code><a href="http://www.manpagez.com/man/8/lsof/">lsof </a> + <em>pathToFile</em></code> command to find which process has the + file given by <em>pathToFile</em> open. </p> <p>In practice, it can be hard to ensure that there are no file handle references to log files. It can be easier to avoid file diff --git a/test.txt b/test.txt deleted file mode 100644 index e69de29..0000000 ----------------------------------------------------------------------- Summary of changes: .../classic/gaffer/GafferConfigurator.groovy | 5 +- .../classic/turbo/ReconfigureOnChangeFilter.java | 94 +++++++------------- .../classic/joran/JoranConfiguratorTest.java | 2 +- .../classic/turbo/ReconfigureOnChangeTest.java | 14 +--- .../java/ch/qos/logback/core/CoreConstants.java | 4 +- .../logback/core/joran/GenericConfigurator.java | 6 +- .../core/joran/spi/ConfigurationWatchList.java | 76 ++++++++++++++++ .../joran/util/ConfigurationWatchListUtil.java | 30 ++++++ .../core/joran/spi/ConfigurationWatchListTest.java | 25 +++++ .../ch/qos/logback/core/joran/spi/PackageTest.java | 2 +- logback-site/src/site/pages/codes.html | 5 +- 11 files changed, 178 insertions(+), 85 deletions(-) create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/spi/ConfigurationWatchList.java create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/util/ConfigurationWatchListUtil.java create mode 100644 logback-core/src/test/java/ch/qos/logback/core/joran/spi/ConfigurationWatchListTest.java delete mode 100644 test.txt hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0