- logback-dev - mailman3.qos.ch

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. release_0.9.19-12-ga85c31b
by git-noreply＠pixie.qos.ch 31 Mar '10

31 Mar '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 a85c31bd64e687260888e5a9567340c084b01c6e (commit) from 60bd9dfb27e27cd509e6a18aa1de80ec6f1379d8 (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=a85c31bd64e687260888e5a9… http://github.com/ceki/logback/commit/a85c31bd64e687260888e5a9567340c084b01… commit a85c31bd64e687260888e5a9567340c084b01c6e Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 31 14:27:13 2010 +0200 - added gradle to the list of projects using logback - edits to manual/configuration.html diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index 86904a4..c675bc3 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -69,7 +69,8 @@ <li><a href="http://www.jfrog.org/products.php">Artifactory</a></li> <li><a href="http://cia.sourceforge.net/">Citizen Intelligence Agency</a></li> <li><a href="http://www.geomajas.org/">Geomajas</a></li> - <li><a href="http://jmxmonitor.sourceforge.net/">jmxmonitor</a></li> + <li><a href="http://www.gradle.org/">Gradle</a></li> + <li><a href="http://jmxmonitor.sourceforge.net/">JMX Monitor</a></li> <li><a href="http://code.google.com/p/openmeetings/">OpenMeetings</a></li> </ul> </td> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 914f52e..a1fad9c 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1417,8 +1417,21 @@ fileName=myApp.log <h3><a name="conditional" href="#conditional">Conditional processing of configuration files</a></h3> - XML syntax is awfully cumbersome to serve as a basis for a - general purpose programming language. Nevertheless, recognizing the + Developers often need to juggle between several logback + configuration files targeting different environments such as + development, testing and production. These configuration files have + substantial parts in common differing only in a few places. To avoid + duplication, logback supports conditional processing of + 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. + + +XML syntax is awfully cumbersome to serve as a basis for a + general purpose programming language. Developers often need to juggle between several logback configuration files targeting different environments such as development, testing and production + +Nevertheless, recognizing the fact that developers need to juggle between several configuration files targeting different environments, e.g. development, testing and production. Often the different files have substantial parts in @@ -1497,11 +1510,14 @@ fileName=myApp.log Conditional processing is supported everywhere within the <code><configuration></code> element. Nested if-then-else - statements are also supported. However, as mentioned earlier, XML is - not a good basis for scripting, and too many conditionals can - quickly render your configuration files ungrokable. + statements are also supported. However, XML syntax is awfully + cumbersome and is ill suited as the foundation of a general purpose + programming langiage. Consequently, too many conditionals will + quickly render your configuration files ungrokable to subsequent + readers of your configuration files, including yourself. +  diff --git a/logback-site/src/site/pages/reasonsToSwitch.html b/logback-site/src/site/pages/reasonsToSwitch.html index 14e401c..8efa3d5 100644 --- a/logback-site/src/site/pages/reasonsToSwitch.html +++ b/logback-site/src/site/pages/reasonsToSwitch.html @@ -101,15 +101,16 @@ <h3><a name="conditional" href="#conditional">Conditional prcessing of configuration files</a></h3> - Recognizing the fact that developers need to juggle between - several configuration files targeting different environments, - e.g. development, testing and production. Often the different - files have substantial parts in common differing only in a few + Developers often need to juggle between several logback + configuration files targeting different environments such as + development, testing and production. These configuration files + have substantial parts in common differing only in a few places. To avoid duplication, logback supports <a href="manual/configuration.html#conditional">conditional processing of configuration files</a> with the help of <code><if></code>, <code><then></code> and - <code><else></code> elements. + <code><else></code> elements so that a single configuration + file can adequately target several environments. ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/index.html | 3 +- .../src/site/pages/manual/configuration.html | 26 ++++++++++++++++---- logback-site/src/site/pages/reasonsToSwitch.html | 11 ++++---- 3 files changed, 29 insertions(+), 11 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCORE-140) Add if then else capability to joran
by Ceki Gulcu (JIRA) 30 Mar '10

30 Mar '10

Add if then else capability to joran ------------------------------------ Key: LBCORE-140 URL: http://jira.qos.ch/browse/LBCORE-140 Project: logback-core Issue Type: New Feature Components: Joran Reporter: Ceki Gulcu Assignee: Logback dev list Example: <confiugure> <if condition=""> <propertyX>...</propertyX> <then> <appender name="FILE" ...> <file>A.log</file> </appender> <then> <else> <appender name="FILE" ...> <file>B.log</file> </appender> <else> </if> </configuration> Support for nested ifs would be nice. -- 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

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. release_0.9.19-11-g60bd9df
by git-noreply＠pixie.qos.ch 30 Mar '10

30 Mar '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 60bd9dfb27e27cd509e6a18aa1de80ec6f1379d8 (commit) from 91737bd88e2830f2d20d016f166d701ffd8ad5b3 (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=60bd9dfb27e27cd509e6a18a… http://github.com/ceki/logback/commit/60bd9dfb27e27cd509e6a18aa1de80ec6f137… commit 60bd9dfb27e27cd509e6a18aa1de80ec6f1379d8 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Mar 31 00:06:32 2010 +0200 - documenting conditional processing - additional test cases for conditional processing diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java index be99ad2..dcb46b5 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; +import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,69 +38,83 @@ import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; - public class ConditionalTest { LoggerContext context = new LoggerContext(); Logger root = context.getLogger(Logger.ROOT_LOGGER_NAME); - int diff = RandomUtil.getPositiveInt(); String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"; - + @Before public void setUp() throws UnknownHostException { - context.setName("c"+diff); + context.setName("c" + diff); context.putProperty("randomOutputDir", randomOutputDir); - InetAddress localhost = InetAddress.getLocalHost(); - context.putProperty("aHost", localhost.getCanonicalHostName()); } - - + + @After + public void tearDown() { + StatusPrinter.printIfErrorsOccured(context); + } + void configure(String file) throws JoranException { JoranConfigurator jc = new JoranConfigurator(); jc.setContext(context); jc.doConfigure(file); } - + @Test - public void conditionalConsoleApp_THEN() throws JoranException, IOException, - InterruptedException { + public void conditionalConsoleApp_IF_THEN_True() throws JoranException, + IOException, InterruptedException { + InetAddress localhost = InetAddress.getLocalHost(); + context.putProperty("aHost", localhost.getCanonicalHostName()); String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "conditional/conditionalConsoleApp.xml"; configure(configFileAsStr); FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); assertNotNull(fileAppender); - + ConsoleAppender consoleAppender = (ConsoleAppender) root.getAppender("CON"); assertNotNull(consoleAppender); - StatusPrinter.printIfErrorsOccured(context); StatusChecker checker = new StatusChecker(context); assertTrue(checker.isErrorFree()); } - + + @Test + public void conditionalConsoleApp_IF_THEN_False() throws JoranException, + IOException, InterruptedException { + + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + + "conditional/conditionalConsoleApp.xml"; + configure(configFileAsStr); + FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); + assertNotNull(fileAppender); + + ConsoleAppender consoleAppender = (ConsoleAppender) root.getAppender("CON"); + assertNull(consoleAppender); + StatusChecker checker = new StatusChecker(context); + assertTrue(checker.isErrorFree()); + } + @Test - public void conditionalConsoleApp_ELSE() throws JoranException, IOException, - InterruptedException { + public void conditionalConsoleApp_IF_THEN_ELSE() throws JoranException, + IOException, InterruptedException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + "conditional/conditionalConsoleApp_ELSE.xml"; configure(configFileAsStr); - - StatusPrinter.print(context); - - + FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); assertNotNull(fileAppender); - + ConsoleAppender consoleAppender = (ConsoleAppender) root.getAppender("CON"); assertNull(consoleAppender); - + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); assertNotNull(listAppender); - - //StatusPrinter.printIfErrorsOccured(context); + + // StatusPrinter.printIfErrorsOccured(context); StatusChecker checker = new StatusChecker(context); assertTrue(checker.isErrorFree()); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java index 7898f4d..b65a139 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java @@ -87,9 +87,12 @@ public class IfAction extends Action { if (!state.boolResult) { listToPlay = state.elseSaxEventList; } - - // insert past this event - interpreter.addEventsDynamically(listToPlay, 1); + + // if boolResult==false & missing else, listToPlay may be null + if(listToPlay != null) { + // insert past this event + interpreter.addEventsDynamically(listToPlay, 1); + } } diff --git a/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml b/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml new file mode 100644 index 0000000..ef1a39f --- /dev/null +++ b/logback-core/src/test/input/joran/conditional/ifWithoutElse.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<x> + <stack name="BEGIN"/> + <if condition='p("Ki1").equals("Val1")'> + <then> + <stack name="a"/> + </then> + </if> + <stack name="END"/> +</x> diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java index 5d3f98b..3a414e8 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java @@ -15,6 +15,7 @@ package ch.qos.logback.core.joran.conditional; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.HashMap; @@ -32,6 +33,7 @@ import ch.qos.logback.core.joran.action.NOPAction; import ch.qos.logback.core.joran.action.ext.StackAction; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; +import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; @@ -62,6 +64,7 @@ public class IfThenElseTest { @After public void tearDown() throws Exception { + StatusPrinter.printIfErrorsOccured(context); StackAction.reset(); } @@ -69,7 +72,6 @@ public class IfThenElseTest { public void if0_Then() throws JoranException { context.putProperty("Ki1", "Val1"); tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); - StatusPrinter.printIfErrorsOccured(context); verifyConfig(new String[] {"BEGIN", "a", "END"}); } @@ -80,6 +82,22 @@ public class IfThenElseTest { } @Test + public void ifWithoutElse_True() throws JoranException { + context.putProperty("Ki1", "Val1"); + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"ifWithoutElse.xml"); + verifyConfig(new String[] {"BEGIN", "a", "END"}); + } + + @Test + public void ifWithoutElse_False() throws JoranException { + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"ifWithoutElse.xml"); + verifyConfig(new String[] {"BEGIN", "END"}); + StatusChecker checker = new StatusChecker(context); + assertTrue(checker.isErrorFree()); + } + + + @Test public void nestedIf() throws JoranException { tc.doConfigure(CONDITIONAL_DIR_PREFIX+"nestedIf.xml"); StatusPrinter.printIfErrorsOccured(context); diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 8208a53..914f52e 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -129,8 +129,8 @@ <code>MyApp1</code>. - Example 3.: Simple example of - <code>BasicConfigurator</code> usage <a + Example: Simple example of <code>BasicConfigurator</code> + usage <a href="../xref/chapters/configuration/MyApp1.html">(logback-examples/src/main/java/chapters/configuration/MyApp1.java)</a> <pre class="prettyprint source">package manual.configuration; @@ -154,7 +154,7 @@ public class MyApp1 { instantiates a Foo object. The Foo class is listed below: - Example 3.: Small class doing logging + Example: Small class doing logging <a href="../xref/chapters/configuration/Foo.html">(logback-examples/src/main/java/chapters/configuration/Foo.java)</a> @@ -231,7 +231,7 @@ public class Foo { seen. - Example 3.: Basic configuration file + Example: Basic configuration file (logback-examples/src/main/java/chapters/configuration/sample0.xml) @@ -276,7 +276,7 @@ public class Foo { addition of two lines of code for printing internal status data. - Example 3.: Print logback's internal status information + Example: Print logback's internal status information <a href="../xref/chapters/configuration/MyApp2.html">(logback-examples/src/main/java/chapters/configuration/MyApp2.java)</a> @@ -325,7 +325,7 @@ public class Foo { - Example 3.: Basic configuration file + Example: Basic configuration file using debug mode (logback-examples/src/main/java/chapters/configuration/sample1.xml) @@ -399,7 +399,7 @@ public class Foo { <code><configuration></code> element to true, as shown next. - Example 3.: Scanning for changes in + Example: Scanning for changes in configuration file and automatic re-configuraion (logback-examples/src/main/java/chapters/configuration/scan1.xml) @@ -416,7 +416,7 @@ public class Foo { units of milliseconds, seconds, minutes or hours. Here is an example: - Example 3.: Specifying a different + Example: Specifying a different scanning period (logback-examples/src/main/java/chapters/configuration/scan2.xml) @@ -468,7 +468,7 @@ public class Foo { application, MyApp3, invokes JoranConfigurator on a configuration file passed as a parameter. - Example 3.: Invoking + Example: Invoking <code>JoranConfigurator</code> directly <a href="../xref/chapters/configuration/MyApp3.html">(logback-examples/src/main/java/chapters/configuration/MyApp3.java)</a> @@ -605,7 +605,7 @@ public class MyApp3 { It is also possible to register one or more status listeners within a configuration file. Here is an example. - Example 3.: Registering a status listener (logback-examples/src/main/java/chapters/configuration/onConsoleStatusListener.xml) + Example: Registering a status listener (logback-examples/src/main/java/chapters/configuration/onConsoleStatusListener.xml) <pre class="prettyprint source"><configuration> <statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" /> @@ -762,7 +762,7 @@ public class MyApp3 { following configuration file shows how to achieve that. -Example 3.: Setting the level of a logger (logback-examples/src/main/java/chapters/configuration/sample2.xml) +Example: Setting the level of a logger (logback-examples/src/main/java/chapters/configuration/sample2.xml) <pre class="prettyprint source"><configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -800,7 +800,7 @@ public class MyApp3 { of the chapters.configuration.Foo logger to <code>DEBUG</code>. -Example 3.: Setting the level of multiple loggers (logback-examples/src/main/java/chapters/configuration/sample3.xml) +Example: Setting the level of multiple loggers (logback-examples/src/main/java/chapters/configuration/sample3.xml) <pre class="source prettyprint"><configuration> <appender name="STDOUT" @@ -879,7 +879,7 @@ public class MyApp3 { sample4.xml is a case in point: - Example 3.: Logger level sample + Example: Logger level sample (logback-examples/src/main/java/chapters/configuration/sample4.xml) <pre class="prettyprint source"><configuration> @@ -1003,7 +1003,7 @@ public class MyApp3 { configuration file illustrates: -Example 3.: Multiple loggers (logback-examples/src/main/java/chapters/configuration/multiple.xml) +Example: Multiple loggers (logback-examples/src/main/java/chapters/configuration/multiple.xml) <pre class="prettyprint source"><configuration> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> @@ -1055,7 +1055,7 @@ public class MyApp3 { duplicated. - Example 3.: Duplicate appender + Example: Duplicate appender (logback-examples/src/main/java/chapters/configuration/duplicate.xml) <pre class="prettyprint source"><configuration> @@ -1101,7 +1101,7 @@ public class MyApp3 { set of loggers flow into a specific appender. - Example 3.: Multiple appender + Example: Multiple appender (logback-examples/src/main/java/chapters/configuration/restricted.xml) <pre class="prettyprint source"><configuration> @@ -1146,7 +1146,7 @@ public class MyApp3 { of the tree. -Example 3.: Additivity flag (logback-examples/src/main/java/chapters/configuration/additivityFlag.xml) +Example: Additivity flag (logback-examples/src/main/java/chapters/configuration/additivityFlag.xml) <pre class="prettyprint source"><configuration> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> @@ -1184,6 +1184,44 @@ public class MyApp3 { foo.log file and only in that file. + + <h3><a name="contextName" href="#contextName">Setting the context name</a></h3> + + As mentioned <a href="architecture.html#LoggerContext">in an + earlier chapter</a>, every logger is attached to logger context. By + default, the logger context is called "default". However, you can + set a different name with the help of the + <code><contextName></code> configuration directive. Note that + once set, the logger context name <a + href="../apidocs/ch/qos/logback/core/ContextBase.html#setName(java.lang.String)">cannot + be changed</a>. Setting the context name is a simple and + straightforward method in order to distinguish between multiple + applications logging to the same target. + + + Example: Set the context name and display it + (logback-examples/src/main/java/chapters/configuration/contextName.xml) + <pre class="prettyprint source"><configuration> + <contextName>myAppName</contextName> + <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d %contextName [%t] %level %logger{36} - %msg%n</pattern> + </encoder> + </appender> + + <root level="debug"> + <appender-ref ref="STDOUT" /> + </root> +</configuration></pre> + + This last examples illustrates naming of the logger + context. Adding the the <a + href="layouts.html#conversionWord">contextName conversion word</a> + in layout's pattern will output the said name. + +  + + <h4><a name="variableSubstitution" href="#variableSubstitution">Variable substitution</a></h4> @@ -1214,7 +1252,7 @@ public class MyApp3 { output file. - Example 3.: Simple Variable substitution + Example: Simple Variable substitution (logback-examples/src/main/java/chapters/configuration/variableSubstitution1.xml) @@ -1243,7 +1281,7 @@ public class MyApp3 { java -DUSER_HOME="/home/sebastien" MyApp2 - Example 3.: System Variable substitution + Example: System Variable substitution (logback-examples/src/main/java/chapters/configuration/variableSubstitution2.xml) @@ -1267,7 +1305,7 @@ public class MyApp3 { how one can do such a setup. - Example 3.: Variable substitution using a + Example: Variable substitution using a separate file (logback-examples/src/main/java/chapters/configuration/variableSubstitution3.xml) @@ -1295,7 +1333,7 @@ public class MyApp3 { file might look like. - Example 3.: Variable file + Example: Variable file (logback-examples/src/main/java/chapters/configuration/variables1.properties) <pre class="source">USER_HOME=/home/sebastien</pre> @@ -1330,7 +1368,7 @@ public class MyApp3 { - Example 3.: Nested variable references + Example: Nested variable references (logback-examples/src/main/java/chapters/configuration/variables2.properties) <pre class="source">USER_HOME=/home/sebastien @@ -1342,7 +1380,7 @@ fileName=myApp.log "fileName". - Example 3.: Variable substitution using + Example: Variable substitution using a separate file (logback-examples/src/main/java/chapters/configuration/variableSubstitution4.xml) @@ -1374,9 +1412,134 @@ fileName=myApp.log operator. For example, assuming aKey is not defined, <code>"${aKey:-golden}"</code> will be interpreted as "golden". +  + + <h3><a name="conditional" href="#conditional">Conditional + processing of configuration files</a></h3> + XML syntax is awfully cumbersome to serve as a basis for a + general purpose programming language. Nevertheless, recognizing the + fact that developers need to juggle between several configuration + files targeting different environments, e.g. development, testing + and production. Often the different files have substantial parts in + common differing only in a few places. To avoid duplication, logback + supports conditional processing of configuration files with the help + of <code><if></code>, <code><then></code> and + <code><else></code> elements. + + The general format for conditional statements is shown below. + + <pre class="prettyprint source"><configuration> + +  + <if condition="some conditional expression"> + <then> + ... + </then> + </if> + +  + <if condition="some conditional expression"> + <then> + ... + </then> + <else> + ... + </else> + </if> + +</configuration></pre> + + The condition is a java expression where only context properties + or system properties are accessible. For a key passed as argument, + the <code>property</code>() or its shorter equivalent + <code>p</code>() methods return the String value of the property. + For example, to access the value a property with key "k", you would + write <code>property("k")</code> or equivalently + <code>p("k")</code>. If the property with key "k" is undefined, the + property method will return the empty string and not null. This + avoids the need to to check for null values. + + In the next example, the <code>ConsoleAppender</code> will be + attached to the root logger, but only if the HOSTNAME is + "torino". Note that the <code>FileAppender</code> named "FILE" is + attached to the root logger in any case. + + + + <pre class="prettyprint source"><configuration> + + <if condition='property("HOSTNAME").contains("torino")'> + <then> + <appender name="CON" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d %-5level %logger{35} - %msg %n</pattern> + </encoder> + </appender> + <root> + <appender-ref ref="CON" /> + </root> + </then> + </if> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>${randomOutputDir}/conditional.log</file> + <encoder> + <pattern>%d %-5level %logger{35} - %msg %n</pattern> + </encoder> + </appender> + + <root level="ERROR"> + <appender-ref ref="FILE" /> + </root> +</configuration></pre> + + + Conditional processing is supported everywhere within the + <code><configuration></code> element. Nested if-then-else + statements are also supported. However, as mentioned earlier, XML is + not a good basis for scripting, and too many conditionals can + quickly render your configuration files ungrokable. + + + +  + + <h3><a name="insertFromJNDI" href="#insertFromJNDI">Obtaining + variables from JNDI</a></h3> + + Under certain circumstances, you may want to make use of + env-entries stored in JNDI. The <code><insertFromJNDI></code> + configuration directive extracts an env-entry stored in JNDI and + inserts it as variable as specified by the as attribute. + + + Example: Insert as properties env-entries obtained via JNDI + (logback-examples/src/main/java/chapters/configuration/insertFromJNDI.xml) + <pre class="prettyprint source"><configuration> + <insertFromJNDI env-entry-name="java:comp/env/appName" as="appName" /> + <contextName>${appName}</contextName> + + <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d %contextName %level %msg %logger{50}%n</pattern> + </encoder> + </appender> + + <root level="DEBUG"> + <appender-ref ref="CONSOLE" /> + </root> +</configuration></pre> + + In this last example, the "java:comp/env/appName" env-entry is + inserted as the appName property. Note + that the <code><contextName></code> directive sets the context + name based on the value of the appName + property inserted by the previous <code><insertFromJNDI></code> + directive. + - <h3><a name="fileInclusion" href="#fileInclusion">File inclusion</a></h3> @@ -1385,7 +1548,7 @@ fileName=myApp.log element, as shown below: - Example 3.: File include + Example: File include (logback-examples/src/main/java/chapters/configuration/containingConfig.xml) <pre class="prettyprint source"><configuration> @@ -1402,7 +1565,7 @@ fileName=myApp.log <code>ConsoleAppender</code> could be declared as: - Example 3.: File include + Example: File include (logback-examples/src/main/java/chapters/configuration/includedConfig.xml) <pre class="source"><included> @@ -1445,77 +1608,6 @@ fileName=myApp.log </ul> - - <h3><a name="contextName" href="#contextName">Setting the context name</a></h3> - - As mentioned <a href="architecture.html#LoggerContext">in an - earlier chapter</a>, every logger is attached to logger context. By - default, the logger context is called "default". However, you can - set a different name with the help of the - <code><contextName></code> configuration directive. Note that - once set, the logger context name <a - href="../apidocs/ch/qos/logback/core/ContextBase.html#setName(java.lang.String)">cannot - be changed</a>. Setting the context name is a simple and - straightforward method in order to distinguish between multiple - applications logging to the same target. - - - Example 3.: Set the context name and display it - (logback-examples/src/main/java/chapters/configuration/contextName.xml) - <pre class="prettyprint source"><configuration> - <contextName>myAppName</contextName> - <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%d %contextName [%t] %level %logger{36} - %msg%n</pattern> - </encoder> - </appender> - - <root level="debug"> - <appender-ref ref="STDOUT" /> - </root> -</configuration></pre> - - This last examples illustrates naming of the logger - context. Adding the the <a - href="layouts.html#conversionWord">contextName conversion word</a> - in layout's pattern will output the said name. - - <h3><a name="insertFromJNDI" href="#insertFromJNDI">Obtaining - variables from JNDI</a></h3> - - Under certain circumstances, you may want to make use of - env-entries stored in JNDI. The <code><insertFromJNDI></code> - configuration directive extracts an env-entry stored in JNDI and - inserts it as variable as specified by the as attribute. - - - Example 3.: Insert as properties env-entries obtained via JNDI - (logback-examples/src/main/java/chapters/configuration/insertFromJNDI.xml) - <pre class="prettyprint source"><configuration> - <insertFromJNDI env-entry-name="java:comp/env/appName" as="appName" /> - <contextName>${appName}</contextName> - - <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> - <encoder> - <pattern>%d %contextName %level %msg %logger{50}%n</pattern> - </encoder> - </appender> - - <root level="DEBUG"> - <appender-ref ref="CONSOLE" /> - </root> -</configuration></pre> - - In this last example, the "java:comp/env/appName" env-entry is - inserted as the appName property. Note - that the <code><contextName></code> directive sets the context - name based on the value of the appName - property inserted by the previous <code><insertFromJNDI></code> - directive.. - - - <script src="../templates/footer.js" type="text/javascript"></script> </div> </body> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index 5599a10..28310bc 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -34,6 +34,10 @@ Fixed issue related to charsets in <code>LayoutWrappingEncoder</code> not being recognized in config files. + + Logback now supports <a + href="manual/configuration.html#conditional">conditional + processing</a> of configuration files. Logback now provides <a href="http://logback.qos.ch/manual/loggingSeparation.html">an @@ -42,7 +46,6 @@ href="http://jira.qos.ch/browse/LBCLASSIC-166">LBCLASSIC-166</a> and <a href="http://jira.qos.ch/browse/LBCLASSIC-87">LBCLASSIC-87</a>. - diff --git a/logback-site/src/site/pages/reasonsToSwitch.html b/logback-site/src/site/pages/reasonsToSwitch.html index 877887d..14e401c 100644 --- a/logback-site/src/site/pages/reasonsToSwitch.html +++ b/logback-site/src/site/pages/reasonsToSwitch.html @@ -98,6 +98,20 @@ working again. + <h3><a name="conditional" href="#conditional">Conditional + prcessing of configuration files</a></h3> + + Recognizing the fact that developers need to juggle between + several configuration files targeting different environments, + e.g. development, testing and production. Often the different + files have substantial parts in common differing only in a few + places. To avoid duplication, logback supports <a + href="manual/configuration.html#conditional">conditional + processing of configuration files</a> with the help of + <code><if></code>, <code><then></code> and + <code><else></code> elements. + + <h3><a name="filters" href="#filters">Filters</a></h3> ----------------------------------------------------------------------- Summary of changes: .../classic/joran/conditional/ConditionalTest.java | 63 +++-- .../logback/core/joran/conditional/IfAction.java | 9 +- .../conditional/{if0.xml => ifWithoutElse.xml} | 5 +- .../core/joran/conditional/IfThenElseTest.java | 20 ++- .../src/site/pages/manual/configuration.html | 286 +++++++++++++------- logback-site/src/site/pages/news.html | 5 +- logback-site/src/site/pages/reasonsToSwitch.html | 14 + 7 files changed, 272 insertions(+), 130 deletions(-) copy logback-core/src/test/input/joran/conditional/{if0.xml => ifWithoutElse.xml} (75%) 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. release_0.9.19-10-g91737bd
by git-noreply＠pixie.qos.ch 30 Mar '10

30 Mar '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 91737bd88e2830f2d20d016f166d701ffd8ad5b3 (commit) from db3e3e278df194d84b0259458515b9709fe0510d (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=91737bd88e2830f2d20d016f… http://github.com/ceki/logback/commit/91737bd88e2830f2d20d016f166d701ffd8ad… commit 91737bd88e2830f2d20d016f166d701ffd8ad5b3 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 30 21:16:23 2010 +0200 - added scalate project to the list of project using logback diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index 9e1b898..86904a4 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -62,33 +62,30 @@ logback, in alphabetical order: - <ul> - - <li><a href="http://www.jfrog.org/products.php">Artifactory</a></li> - - <li><a href="http://cia.sourceforge.net/">Citizen Intelligence Agency</a></li> - - <li><a href="http://www.geomajas.org/">Geomajas</a></li> - - <li><a href="http://jmxmonitor.sourceforge.net/">jmxmonitor</a></li> - - - <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://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> - - </ul> - + <table border="0"> + <tr> + <td valign="top"> + <ul> + <li><a href="http://www.jfrog.org/products.php">Artifactory</a></li> + <li><a href="http://cia.sourceforge.net/">Citizen Intelligence Agency</a></li> + <li><a href="http://www.geomajas.org/">Geomajas</a></li> + <li><a href="http://jmxmonitor.sourceforge.net/">jmxmonitor</a></li> + <li><a href="http://code.google.com/p/openmeetings/">OpenMeetings</a></li> + </ul> + </td> + <td> + <ul> + <li><a href="http://liftweb.net/">Lift</a></li> + <li><a href="http://www.red5.org">Red5</a></li> + <li><a href="http://http://scalate.fusesource.org/">Scalate</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> + </ul> + </td> + </tr> + </table> <script src="templates/footer.js" type="text/javascript"></script> </div> </body> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/index.html | 51 +++++++++++++++----------------- 1 files changed, 24 insertions(+), 27 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, lbclassic182, created. release_0.9.19-10-g0348b40
by git-noreply＠pixie.qos.ch 30 Mar '10

30 Mar '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, lbclassic182 has been created at 0348b40b4ea9e290ca147928a45bb20194f54dd4 (commit) - Log ----------------------------------------------------------------- http://git.qos.ch/gitweb/?p=logback.git;a=commit;h=0348b40b4ea9e290ca147928… http://github.com/ceki/logback/commit/0348b40b4ea9e290ca147928a45bb20194f54… commit 0348b40b4ea9e290ca147928a45bb20194f54dd4 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 30 20:45:43 2010 +0200 Applied Aleksey Didik's patch for LBCLASSIC-182 diff --git a/logback-core/src/main/java/ch/qos/logback/core/PropertyDefinerBase.java b/logback-core/src/main/java/ch/qos/logback/core/PropertyDefinerBase.java new file mode 100644 index 0000000..d2f53c9 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/PropertyDefinerBase.java @@ -0,0 +1,13 @@ +package ch.qos.logback.core; + +import ch.qos.logback.core.spi.ContextAwareBase; +import ch.qos.logback.core.spi.PropertyDefiner; + +/** + * Set a skeleton implementation for property definers + * just for have ContextAwareBase. + * + * @author Aleksey Didik + */ +public abstract class PropertyDefinerBase extends ContextAwareBase implements PropertyDefiner { +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java b/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java index 2bb626a..37e3dcf 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java @@ -22,6 +22,7 @@ import ch.qos.logback.core.joran.action.AppenderAction; import ch.qos.logback.core.joran.action.AppenderRefAction; import ch.qos.logback.core.joran.action.ContextPropertyAction; import ch.qos.logback.core.joran.action.ConversionRuleAction; +import ch.qos.logback.core.joran.action.DefinePropertyAction; import ch.qos.logback.core.joran.action.NestedBasicPropertyIA; import ch.qos.logback.core.joran.action.NestedComplexPropertyIA; import ch.qos.logback.core.joran.action.NewRuleAction; @@ -48,7 +49,6 @@ import ch.qos.logback.core.joran.spi.RuleStore; * @author Ceki Gülcü */ abstract public class JoranConfiguratorBase extends GenericConfigurator { - public List getErrorList() { return null; @@ -56,29 +56,27 @@ abstract public class JoranConfiguratorBase extends GenericConfigurator { @Override protected void addInstanceRules(RuleStore rs) { - - rs.addRule(new Pattern("configuration/property"), - new PropertyAction()); - + + rs.addRule(new Pattern("configuration/property"), new PropertyAction()); + rs.addRule(new Pattern("configuration/substitutionProperty"), new PropertyAction()); - - rs.addRule(new Pattern("configuration/timestamp"), - new TimestampAction()); - + + rs.addRule(new Pattern("configuration/timestamp"), new TimestampAction()); + + rs.addRule(new Pattern("configuration/define"), new DefinePropertyAction()); + // the contextProperty pattern is deprecated. It is undocumented // and will be dropped in future versions of logback rs.addRule(new Pattern("configuration/contextProperty"), new ContextPropertyAction()); - + rs.addRule(new Pattern("configuration/conversionRule"), new ConversionRuleAction()); rs.addRule(new Pattern("configuration/statusListener"), new StatusListenerAction()); - - rs.addRule(new Pattern("configuration/appender"), new AppenderAction()); rs.addRule(new Pattern("configuration/appender/appender-ref"), new AppenderRefAction()); @@ -101,7 +99,8 @@ abstract public class JoranConfiguratorBase extends GenericConfigurator { @Override protected void buildInterpreter() { super.buildInterpreter(); - Map<String, Object> omap = interpreter.getInterpretationContext().getObjectMap(); + Map<String, Object> omap = interpreter.getInterpretationContext() + .getObjectMap(); omap.put(ActionConst.APPENDER_BAG, new HashMap()); omap.put(ActionConst.FILTER_CHAIN_BAG, new HashMap()); } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/action/DefinePropertyAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/action/DefinePropertyAction.java new file mode 100644 index 0000000..12b6bb7 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/action/DefinePropertyAction.java @@ -0,0 +1,98 @@ +/** + * 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.core.joran.action; + +import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.util.OptionHelper; +import ch.qos.logback.core.spi.PropertyDefiner; +import org.xml.sax.Attributes; + +/** + * Instantiate class for define property value. Get future property name and + * property definer class from attributes. Some property definer properties + * could be used. After defining put new property to context. + * + * @author Aleksey Didik + */ +public class DefinePropertyAction extends Action { + + String propertyName; + PropertyDefiner definer; + boolean inError; + + public void begin(InterpretationContext ec, String localName, + Attributes attributes) throws ActionException { + // reset variables + propertyName = null; + definer = null; + inError = false; + + // read future property name + propertyName = attributes.getValue(NAME_ATTRIBUTE); + if (OptionHelper.isEmpty(propertyName)) { + addError("Missing property name for property definer. Near [" + localName + + "] line " + getLineNumber(ec)); + inError = true; + return; + } + + // read property definer class name + String className = attributes.getValue(CLASS_ATTRIBUTE); + if (OptionHelper.isEmpty(className)) { + addError("Missing class name for property definer. Near [" + localName + + "] line " + getLineNumber(ec)); + inError = true; + return; + } + + // try to instantiate property definer + try { + addInfo("About to instantiate property definer of type [" + className + + "]"); + definer = (PropertyDefiner) OptionHelper.instantiateByClassName( + className, PropertyDefiner.class, context); + definer.setContext(context); + ec.pushObject(definer); + } catch (Exception oops) { + inError = true; + addError("Could not create an PropertyDefiner of type [" + className + + "].", oops); + throw new ActionException(oops); + } + } + + /** + * Now property definer is initialized by all properties and we can put + * property value to context + */ + public void end(InterpretationContext ec, String name) { + if (inError) { + return; + } + + Object o = ec.peekObject(); + + if (o != definer) { + addWarn("The object at the of the stack is not the property definer for property named [" + + propertyName + "] pushed earlier."); + } else { + addInfo("Popping property definer for property named [" + propertyName + + "] from the object stack"); + ec.popObject(); + // let's put defined property and value to context + context.putProperty(propertyName, definer.getPropertyValue()); + } + } +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/spi/PropertyDefiner.java b/logback-core/src/main/java/ch/qos/logback/core/spi/PropertyDefiner.java new file mode 100644 index 0000000..01f90c1 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/spi/PropertyDefiner.java @@ -0,0 +1,24 @@ +/** + * 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.core.spi; + +public interface PropertyDefiner extends ContextAware { + + /** + * Get the property value, defined by this property definer + * + * @return defined property value + */ + String getPropertyValue(); +} diff --git a/logback-core/src/test/input/joran/define/badclass.xml b/logback-core/src/test/input/joran/define/badclass.xml new file mode 100644 index 0000000..fde9b69 --- /dev/null +++ b/logback-core/src/test/input/joran/define/badclass.xml @@ -0,0 +1 @@ +<define name="foo" class="a.b.c.Foo"/> diff --git a/logback-core/src/test/input/joran/define/good.xml b/logback-core/src/test/input/joran/define/good.xml new file mode 100644 index 0000000..be56cc2 --- /dev/null +++ b/logback-core/src/test/input/joran/define/good.xml @@ -0,0 +1,3 @@ +<define name="foo" class="ch.qos.logback.core.joran.action.FooPropertyDefiner"> + <fooName>Monster</fooName> +</define> \ No newline at end of file diff --git a/logback-core/src/test/input/joran/define/noclass.xml b/logback-core/src/test/input/joran/define/noclass.xml new file mode 100644 index 0000000..300efaf --- /dev/null +++ b/logback-core/src/test/input/joran/define/noclass.xml @@ -0,0 +1,3 @@ +<define name="foo"> + <fooName>Monster</fooName> +</define> \ No newline at end of file diff --git a/logback-core/src/test/input/joran/define/noname.xml b/logback-core/src/test/input/joran/define/noname.xml new file mode 100644 index 0000000..aed88c7 --- /dev/null +++ b/logback-core/src/test/input/joran/define/noname.xml @@ -0,0 +1,3 @@ +<define class="ch.qos.logback.core.joran.action.FooPropertyDefiner"> + <fooName>Monster</fooName> +</define> \ No newline at end of file diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/DefinePropertyActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/DefinePropertyActionTest.java new file mode 100644 index 0000000..4514317 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/DefinePropertyActionTest.java @@ -0,0 +1,129 @@ +/** + * 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.core.joran.action; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.HashMap; +import java.util.Iterator; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.joran.SimpleConfigurator; +import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.joran.spi.Pattern; +import ch.qos.logback.core.status.ErrorStatus; +import ch.qos.logback.core.util.CoreTestConstants; + +/** + * Test {@link DefinePropertyAction}. + * + * @author Aleksey Didik + */ +public class DefinePropertyActionTest { + + private static final String DEFINE_XML_DIR = CoreTestConstants.JORAN_INPUT_PREFIX + + "define/"; + private static final String GOOD_XML = "good.xml"; + private static final String NONAME_XML = "noname.xml"; + private static final String NOCLASS_XML = "noclass.xml"; + private static final String BADCLASS_XML = "badclass.xml"; + + SimpleConfigurator sc; + Context context; + DefinePropertyAction definerAction; + InterpretationContext ic; + + @Before + public void setUp() throws Exception { + context = new ContextBase(); + HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); + rulesMap.put(new Pattern("define"), new DefinePropertyAction()); + sc = new SimpleConfigurator(rulesMap); + sc.setContext(context); + + } + + @Test + public void testAllRight() throws JoranException { + sc.doConfigure(DEFINE_XML_DIR + GOOD_XML); + // get from context + String inContextFoo = context.getProperty("foo"); + // get from real class + FooPropertyDefiner fooDefiner = new FooPropertyDefiner(); + fooDefiner.setFooName("Monster"); + String fromRealClassFoo = fooDefiner.getPropertyValue(); + assertEquals(inContextFoo, fromRealClassFoo); + } + + @Test + public void testNoName() throws JoranException { + sc.doConfigure(DEFINE_XML_DIR + NONAME_XML); + // get from context + String inContextFoo = context.getProperty("foo"); + assertNull(inContextFoo); + // check context errors + assertTrue(checkError("Missing property name for property definer. Near [define] line 1")); + } + + @Test + public void testNoClass() throws JoranException { + sc.doConfigure(DEFINE_XML_DIR + NOCLASS_XML); + // get from context + String inContextFoo = context.getProperty("foo"); + assertNull(inContextFoo); + // check context errors + assertTrue(checkError("Missing class name for property definer. Near [define] line 1")); + } + + @Test + public void testBadClass() throws JoranException { + sc.doConfigure(DEFINE_XML_DIR + BADCLASS_XML); + // get from context + String inContextFoo = context.getProperty("foo"); + assertNull(inContextFoo); + // check context errors + assertTrue(checkBadClassError()); + } + + @After + public void tearDown() throws Exception { + context = null; + sc = null; + } + + private boolean checkError(String waitedMsg) { + Iterator it = context.getStatusManager().getCopyOfStatusList().iterator(); + ErrorStatus es1 = (ErrorStatus) it.next(); + return waitedMsg.equals(es1.getMessage()); + } + + private boolean checkBadClassError() { + Iterator it = context.getStatusManager().getCopyOfStatusList().iterator(); + // skip info about class instantiating + it.next(); + // check error status + ErrorStatus es1 = (ErrorStatus) it.next(); + return "Could not create an PropertyDefiner of type [a.b.c.Foo]." + .equals(es1.getMessage()); + } + +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/FooPropertyDefiner.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/FooPropertyDefiner.java new file mode 100644 index 0000000..e1aa240 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/FooPropertyDefiner.java @@ -0,0 +1,29 @@ +/** + * 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.core.joran.action; + +import ch.qos.logback.core.PropertyDefinerBase; + +public class FooPropertyDefiner extends PropertyDefinerBase { + + private String fooName; + + public String getPropertyValue() { + return "Foo[" + fooName + "]"; + } + + public void setFooName(String fooName) { + this.fooName = fooName; + } +} ----------------------------------------------------------------------- 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. release_0.9.19-9-gdb3e3e2
by git-noreply＠pixie.qos.ch 30 Mar '10

30 Mar '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 db3e3e278df194d84b0259458515b9709fe0510d (commit) from c9f58e8f6a1372a08fef830ac1c3e8faa38c5abf (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=db3e3e278df194d84b025945… http://github.com/ceki/logback/commit/db3e3e278df194d84b0259458515b9709fe05… commit db3e3e278df194d84b0259458515b9709fe0510d Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 30 18:38:48 2010 +0200 - added support for <if> statement nested within <if> statements or or <include> statement nested <if> statements or <if> nested within <include> diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java index 63ede3f..83db5ee 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java @@ -1,44 +1,28 @@ +/** + * 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.core.joran.conditional; -import java.util.ArrayList; import java.util.List; -import org.xml.sax.Attributes; - -import ch.qos.logback.core.joran.action.Action; -import ch.qos.logback.core.joran.event.InPlayListener; import ch.qos.logback.core.joran.event.SaxEvent; -import ch.qos.logback.core.joran.spi.ActionException; -import ch.qos.logback.core.joran.spi.InterpretationContext; - -public class ElseAction extends Action implements InPlayListener { - List<SaxEvent> saxEventList; - - @Override - public void begin(InterpretationContext ic, String name, Attributes attributes) - throws ActionException { - saxEventList = new ArrayList<SaxEvent>(); - ic.addInPlayListener(this); - } +public class ElseAction extends ThenOrElseActionBase { @Override - public void end(InterpretationContext ic, String name) throws ActionException { - ic.removeInPlayListener(this); - Object o = ic.peekObject(); - if (o instanceof IfAction) { - IfAction ifAction = (IfAction) o; - removeFirstLastFromList(); - ifAction.setElseSaxEventList(saxEventList); - } + void registerEventList(IfAction ifAction, List<SaxEvent> eventList) { + ifAction.setElseSaxEventList(eventList); + } - public void inPlay(SaxEvent event) { - saxEventList.add(event); - } - - void removeFirstLastFromList() { - saxEventList.remove(0); - saxEventList.remove(saxEventList.size() - 1); - } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java index 2c35649..7898f4d 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java @@ -1,6 +1,7 @@ package ch.qos.logback.core.joran.conditional; import java.util.List; +import java.util.Stack; import org.xml.sax.Attributes; @@ -14,14 +15,22 @@ import ch.qos.logback.core.util.OptionHelper; public class IfAction extends Action { private static final String CONDITION_ATTR = "condition"; - Boolean boolResult; - List<SaxEvent> thenSaxEventList; - List<SaxEvent> elseSaxEventList; + Stack<IfState> stack = new Stack<IfState>(); + @Override public void begin(InterpretationContext ic, String name, Attributes attributes) throws ActionException { + IfState state = new IfState(); + boolean emptyStack = stack.isEmpty(); + stack.push(state); + + if(!emptyStack) { + return; + } + + state.active = true; ic.pushObject(this); Condition condition = null; @@ -37,7 +46,7 @@ public class IfAction extends Action { } if(condition!=null) { - boolResult = condition.evaluate(); + state.boolResult = condition.evaluate(); } } @@ -47,6 +56,12 @@ public class IfAction extends Action { @Override public void end(InterpretationContext ic, String name) throws ActionException { + IfState state = stack.pop(); + if(!state.active) { + return; + } + + Object o = ic.peekObject(); if (o == null) { throw new IllegalStateException("Unexpected null object on stack"); @@ -62,15 +77,15 @@ public class IfAction extends Action { } ic.popObject(); - if (boolResult == null) { + if (state.boolResult == null) { addError("Failed to determine \"if then else\" result"); return; } Interpreter interpreter = ic.getJoranInterpreter(); - List<SaxEvent> listToPlay = thenSaxEventList; - if (!boolResult) { - listToPlay = elseSaxEventList; + List<SaxEvent> listToPlay = state.thenSaxEventList; + if (!state.boolResult) { + listToPlay = state.elseSaxEventList; } // insert past this event @@ -80,11 +95,29 @@ public class IfAction extends Action { public void setThenSaxEventList(List<SaxEvent> thenSaxEventList) { - this.thenSaxEventList = thenSaxEventList; + IfState state = stack.firstElement(); + if(state.active) { + state.thenSaxEventList = thenSaxEventList; + } else { + throw new IllegalStateException("setThenSaxEventList() invoked on inactive IfAction"); + } } public void setElseSaxEventList(List<SaxEvent> elseSaxEventList) { - this.elseSaxEventList = elseSaxEventList; + IfState state = stack.firstElement(); + if(state.active) { + state.elseSaxEventList = elseSaxEventList; + } else { + throw new IllegalStateException("setElseSaxEventList() invoked on inactive IfAction"); + } + } } + +class IfState { + Boolean boolResult; + List<SaxEvent> thenSaxEventList; + List<SaxEvent> elseSaxEventList; + boolean active; +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java index 5e5f99b..4a95833 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java @@ -1,46 +1,28 @@ +/** + * 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.core.joran.conditional; -import java.util.ArrayList; import java.util.List; -import org.xml.sax.Attributes; - -import ch.qos.logback.core.joran.action.Action; -import ch.qos.logback.core.joran.event.InPlayListener; import ch.qos.logback.core.joran.event.SaxEvent; -import ch.qos.logback.core.joran.spi.ActionException; -import ch.qos.logback.core.joran.spi.InterpretationContext; - -public class ThenAction extends Action implements InPlayListener { - List<SaxEvent> eventList; - - @Override - public void begin(InterpretationContext ic, String name, Attributes attributes) - throws ActionException { - eventList = new ArrayList<SaxEvent>(); - ic.addInPlayListener(this); - } +public class ThenAction extends ThenOrElseActionBase { @Override - public void end(InterpretationContext ic, String name) throws ActionException { - ic.removeInPlayListener(this); - Object o = ic.peekObject(); - if (o instanceof IfAction) { - IfAction ifAction = (IfAction) o; - removeFirstLastFromList(); - ifAction.setThenSaxEventList(eventList); - } else { - throw new IllegalStateException("Missing IfAction on top of stack"); - } + void registerEventList(IfAction ifAction, List<SaxEvent> eventList) { + ifAction.setThenSaxEventList(eventList); + } - public void inPlay(SaxEvent event) { - eventList.add(event); - } - - void removeFirstLastFromList() { - eventList.remove(0); - eventList.remove(eventList.size() - 1); - } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenOrElseActionBase.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenOrElseActionBase.java new file mode 100644 index 0000000..1b52a8c --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenOrElseActionBase.java @@ -0,0 +1,76 @@ +/** + * 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.core.joran.conditional; + +import java.util.ArrayList; +import java.util.List; +import java.util.Stack; + +import org.xml.sax.Attributes; + +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.event.InPlayListener; +import ch.qos.logback.core.joran.event.SaxEvent; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.joran.spi.InterpretationContext; + +abstract public class ThenOrElseActionBase extends Action { + + Stack<ThenActionState> stateStack = new Stack<ThenActionState>(); + + @Override + public void begin(InterpretationContext ic, String name, Attributes attributes) + throws ActionException { + ThenActionState state = new ThenActionState(); + if (ic.isListenerListEmpty()) { + ic.addInPlayListener(state); + state.isRegistered = true; + } + stateStack.push(state); + } + + @Override + public void end(InterpretationContext ic, String name) throws ActionException { + ThenActionState state = stateStack.pop(); + if (state.isRegistered) { + ic.removeInPlayListener(state); + Object o = ic.peekObject(); + if (o instanceof IfAction) { + IfAction ifAction = (IfAction) o; + removeFirstAndLastFromList(state.eventList); + registerEventList(ifAction, state.eventList); + } else { + throw new IllegalStateException("Missing IfAction on top of stack"); + } + } + } + + abstract void registerEventList(IfAction ifAction, List<SaxEvent> eventList); + + void removeFirstAndLastFromList(List<SaxEvent> eventList) { + eventList.remove(0); + eventList.remove(eventList.size() - 1); + } + +} + +class ThenActionState implements InPlayListener { + + List<SaxEvent> eventList = new ArrayList<SaxEvent>(); + boolean isRegistered = false; + + public void inPlay(SaxEvent event) { + eventList.add(event); + } +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java index ccdc9a3..a594014 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/InterpretationContext.java @@ -173,6 +173,13 @@ public class InterpretationContext extends ContextAwareBase implements return OptionHelper.substVars(value, this); } + + + + public boolean isListenerListEmpty() { + return listenerList.isEmpty(); + } + public void addInPlayListener(InPlayListener ipl) { if (listenerList.contains(ipl)) { addWarn("InPlayListener " + ipl + " has been already registered"); diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java index b720312..599c776 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java @@ -337,29 +337,6 @@ public class Interpreter { player.addEventsDynamically(eventList, offset); } } - - /** - * Pop from the stack if the top most element matches 'name'. Returns whether - * the top most element matched. - * - * @param name - * @return whether the top most element matched 'name' - */ - public boolean popIfMatch(String name) { - boolean match = pattern.peekLast().equals(name); - if (match) { - pattern.pop(); - } - return match; - } - - /** - * Intended for internal use. - * @param name - */ - public void patternPush(String name) { - pattern.push(name); - } } /** diff --git a/logback-core/src/test/input/joran/conditional/if0.xml b/logback-core/src/test/input/joran/conditional/if0.xml index 0273e59..b843dcc 100644 --- a/logback-core/src/test/input/joran/conditional/if0.xml +++ b/logback-core/src/test/input/joran/conditional/if0.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="UTF-8" ?> <x> + <stack name="BEGIN"/> <if condition='p("Ki1").equals("Val1")'> <then> - <inc increment="1"/> + <stack name="a"/> </then> <else> - <inc increment="1"/> - <inc increment="1"/> + <stack name="b"/> </else> </if> + <stack name="END"/> </x> diff --git a/logback-core/src/test/input/joran/conditional/if2.xml b/logback-core/src/test/input/joran/conditional/if2.xml deleted file mode 100644 index bc70e1f..0000000 --- a/logback-core/src/test/input/joran/conditional/if2.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> - -<x> - <if class=""> - <a>asd</a> - <then> - <inc increment="1"/> - </then> - <else> - <inc increment="1"/> - <inc increment="1"/> - </else> - </if> -</x> diff --git a/logback-core/src/test/input/joran/inclusion/included.xml b/logback-core/src/test/input/joran/conditional/includedA.xml similarity index 51% copy from logback-core/src/test/input/joran/inclusion/included.xml copy to logback-core/src/test/input/joran/conditional/includedA.xml index 7dfb5fe..ecb4360 100644 --- a/logback-core/src/test/input/joran/inclusion/included.xml +++ b/logback-core/src/test/input/joran/conditional/includedA.xml @@ -2,8 +2,6 @@ <!DOCTYPE included> <included> - - <inc increment="1"/> - <inc increment="1"/> - + <stack name="IncludedA0"/> + <stack name="IncludedA1"/> </included> \ No newline at end of file diff --git a/logback-core/src/test/input/joran/inclusion/second.xml b/logback-core/src/test/input/joran/conditional/includedB.xml similarity index 63% copy from logback-core/src/test/input/joran/inclusion/second.xml copy to logback-core/src/test/input/joran/conditional/includedB.xml index 3351857..84974b7 100644 --- a/logback-core/src/test/input/joran/inclusion/second.xml +++ b/logback-core/src/test/input/joran/conditional/includedB.xml @@ -2,7 +2,5 @@ <!DOCTYPE included> <included> - - <inc increment="1"/> - + <stack name="IncludedB0"/> </included> \ No newline at end of file diff --git a/logback-core/src/test/input/joran/conditional/nestedIf.xml b/logback-core/src/test/input/joran/conditional/nestedIf.xml new file mode 100644 index 0000000..0751237 --- /dev/null +++ b/logback-core/src/test/input/joran/conditional/nestedIf.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + +<x> + <stack name="BEGIN"/> + + <if condition='1 == 1'> + <then> + <stack name="a"/> + <if condition='1 != 1'> + <then> + <stack name="b"/> + </then> + <else> + <stack name="c"/> + </else> + </if> + </then> + <else> + <stack name="d"/> + </else> + </if> + <stack name="END"/> + +</x> + diff --git a/logback-core/src/test/input/joran/conditional/nestedInclude.xml b/logback-core/src/test/input/joran/conditional/nestedInclude.xml new file mode 100644 index 0000000..4aa8617 --- /dev/null +++ b/logback-core/src/test/input/joran/conditional/nestedInclude.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + +<x> + <stack name="BEGIN"/> + + <if condition='1 != 1'> + <then> + <stack name="t0"/> + <include file="${thenFileToInclude}"/> + <stack name="t1"/> + </then> + <else> + <stack name="e0"/> + <include file="${elseFileToInclude}"/> + <stack name="e1"/> + </else> + </if> + <stack name="END"/> + +</x> + diff --git a/logback-core/src/test/input/joran/inclusion/included.xml b/logback-core/src/test/input/joran/inclusion/included.xml index 7dfb5fe..8ce1cd1 100644 --- a/logback-core/src/test/input/joran/inclusion/included.xml +++ b/logback-core/src/test/input/joran/inclusion/included.xml @@ -3,7 +3,7 @@ <included> - <inc increment="1"/> - <inc increment="1"/> + <stack name="IA"/> + <stack name="IB"/> </included> \ No newline at end of file diff --git a/logback-core/src/test/input/joran/inclusion/intermediaryByFile.xml b/logback-core/src/test/input/joran/inclusion/intermediaryByFile.xml new file mode 100644 index 0000000..dce2acb --- /dev/null +++ b/logback-core/src/test/input/joran/inclusion/intermediaryByFile.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE x> + +<included> + <stack name="a"/> + <include file="${subFileKey}" /> + <stack name="c"/> +</included> diff --git a/logback-core/src/test/input/joran/inclusion/second.xml b/logback-core/src/test/input/joran/inclusion/second.xml index 3351857..32beaf0 100644 --- a/logback-core/src/test/input/joran/inclusion/second.xml +++ b/logback-core/src/test/input/joran/inclusion/second.xml @@ -3,6 +3,6 @@ <included> - <inc increment="1"/> + <stack name="SECOND"/> </included> \ No newline at end of file diff --git a/logback-core/src/test/input/joran/inclusion/subByFile.xml b/logback-core/src/test/input/joran/inclusion/subByFile.xml index 5f82d77..b351583 100644 --- a/logback-core/src/test/input/joran/inclusion/subByFile.xml +++ b/logback-core/src/test/input/joran/inclusion/subByFile.xml @@ -1,6 +1,3 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE included> - <included> - <include file="${includeKey}" /> -</<included> + <stack name="b"/> +</included> diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java index d65ac45..ad7a3f6 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java @@ -23,7 +23,9 @@ import org.junit.runners.Suite.SuiteClasses; ch.qos.logback.core.joran.util.PackageTest.class, ch.qos.logback.core.joran.spi.PackageTest.class, ch.qos.logback.core.joran.replay.PackageTest.class, - ch.qos.logback.core.joran.implicitAction.PackageTest.class + ch.qos.logback.core.joran.implicitAction.PackageTest.class, + ch.qos.logback.core.joran.conditional.PackageTest.class, + }) public class PackageTest { diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java index 372a00b..1f31383 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/IncludeActionTest.java @@ -23,7 +23,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.net.MalformedURLException; import java.net.UnknownHostException; +import java.util.Arrays; import java.util.HashMap; +import java.util.Stack; import org.junit.After; import org.junit.Before; @@ -33,7 +35,7 @@ import org.xml.sax.SAXParseException; import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.TrivialConfigurator; -import ch.qos.logback.core.joran.action.ext.IncAction; +import ch.qos.logback.core.joran.action.ext.StackAction; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.status.Status; @@ -57,6 +59,9 @@ public class IncludeActionTest { static final String TOP_BY_FILE = INCLUSION_DIR_PREFIX + "topByFile.xml"; + static final String INTERMEDIARY_FILE = INCLUSION_DIR_PREFIX + "intermediaryByFile.xml"; + + static final String SUB_FILE = INCLUSION_DIR_PREFIX + "subByFile.xml"; static final String MULTI_INCLUDE_BY_FILE = INCLUSION_DIR_PREFIX @@ -82,43 +87,42 @@ public class IncludeActionTest { public void setUp() throws Exception { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); - rulesMap.put(new Pattern("x/inc"), new IncAction()); rulesMap.put(new Pattern("x/include"), new IncludeAction()); - + rulesMap.put(new Pattern("x/stack"), new StackAction()); + tc = new TrivialConfigurator(rulesMap); tc.setContext(context); - IncAction.reset(); } @After public void tearDown() throws Exception { + StatusPrinter.printInCaseOfErrorsOrWarnings(context); context = null; System.clearProperty(INCLUDE_KEY); System.clearProperty(SECOND_FILE_KEY); System.clearProperty(SUB_FILE_KEY); + StackAction.reset(); } @Test public void basicFile() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_FILE); tc.doConfigure(TOP_BY_FILE); - verifyConfig(2); + verifyConfig(new String[] {"IA", "IB"}); } @Test public void basicResource() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_AS_RESOURCE); tc.doConfigure(INCLUDE_BY_RESOURCE); - StatusPrinter.print(context); - verifyConfig(2); + verifyConfig(new String[] {"AR_A", "AR_B"}); } @Test public void basicURL() throws JoranException { System.setProperty(INCLUDE_KEY, URL_TO_INCLUDE); tc.doConfigure(TOP_BY_URL); - StatusPrinter.print(context); - verifyConfig(2); + verifyConfig(new String[] {"IA", "IB"}); } @Test @@ -184,37 +188,28 @@ public class IncludeActionTest { @Test public void nestedInclude() throws JoranException { - System.setProperty(SUB_FILE_KEY, INCLUDED_FILE); - System.setProperty(INCLUDE_KEY, SECOND_FILE); + System.setProperty(SUB_FILE_KEY, SUB_FILE); + System.setProperty(INCLUDE_KEY, INTERMEDIARY_FILE); tc.doConfigure(TOP_BY_FILE); - StatusPrinter.print(context); - verifyConfig(1); - - } + Stack<String> witness = new Stack<String>(); + witness.push("a"); + witness.push("b"); + witness.push("c"); + assertEquals(witness, StackAction.stack); + } @Test public void multiInclude() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_FILE); System.setProperty(SECOND_FILE_KEY, SECOND_FILE); tc.doConfigure(MULTI_INCLUDE_BY_FILE); - verifyConfig(3); - } - - @Test - public void saxParseException() throws JoranException { - System.setProperty(INCLUDE_KEY, INCLUDED_FILE); - System.setProperty(SECOND_FILE_KEY, SECOND_FILE); - tc.doConfigure(MULTI_INCLUDE_BY_FILE); - verifyConfig(3); - } - - @Test - public void errorInDoBegin() { - + verifyConfig(new String[] {"IA", "IB", "SECOND"}); } - - void verifyConfig(int expected) { - assertEquals(expected, IncAction.beginCount); - assertEquals(expected, IncAction.endCount); + + void verifyConfig(String[] expected) { + Stack<String> witness = new Stack<String>(); + witness.addAll(Arrays.asList(expected)); + assertEquals(witness, StackAction.stack); } + } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackAction.java similarity index 73% rename from logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java rename to logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackAction.java index 48beaff..e198345 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackCounterAction.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/StackAction.java @@ -14,30 +14,27 @@ package ch.qos.logback.core.joran.action.ext; +import java.util.Stack; + import org.xml.sax.Attributes; -import ch.qos.logback.core.Layout; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.spi.InterpretationContext; -public class StackCounterAction extends Action { - Layout layout; - +public class StackAction extends Action { - public StackCounterAction() { - } + public static Stack<String> stack = new Stack<String>(); public void begin(InterpretationContext ec, String name, Attributes attributes) { - //String str = "Pushing "+name+"-begin"; - ec.pushObject(name+"-begin"); + stack.push(attributes.getValue("name")); } public void end(InterpretationContext ec, String name) { - ec.pushObject(name+"-end"); } - public void finish(InterpretationContext ec) { + static public void reset() { + stack.clear(); } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java similarity index 59% copy from logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java copy to logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java index bf9aa89..c354999 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseAndIncludeCompositionTest.java @@ -13,10 +13,11 @@ */ package ch.qos.logback.core.joran.conditional; - import static org.junit.Assert.assertEquals; +import java.util.Arrays; import java.util.HashMap; +import java.util.Stack; import org.junit.After; import org.junit.Before; @@ -26,33 +27,42 @@ import ch.qos.logback.core.Context; import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.TrivialConfigurator; import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.action.IncludeAction; import ch.qos.logback.core.joran.action.NOPAction; -import ch.qos.logback.core.joran.action.ext.IncAction; +import ch.qos.logback.core.joran.action.ext.StackAction; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; -public class IfThenElseTest { +public class IfThenElseAndIncludeCompositionTest { Context context = new ContextBase(); TrivialConfigurator tc; int diff = RandomUtil.getPositiveInt(); static final String CONDITIONAL_DIR_PREFIX = CoreTestConstants.JORAN_INPUT_PREFIX - + "conditional/"; + + "conditional/"; + final static String THEN_FILE_TO_INCLUDE_KEY = "thenFileToInclude"; + final static String ELSE_FILE_TO_INCLUDE_KEY = "elseFileToInclude"; + + static final String NESTED_INCLUDE_FILE = CONDITIONAL_DIR_PREFIX+"nestedInclude.xml"; + static final String THEN_FILE_TO_INCLUDE = CONDITIONAL_DIR_PREFIX+"includedA.xml"; + static final String ELSE_FILE_TO_INCLUDE = CONDITIONAL_DIR_PREFIX+"includedB.xml"; + @Before public void setUp() throws Exception { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); - rulesMap.put(new Pattern("x/inc"), new IncAction()); + rulesMap.put(new Pattern("x/stack"), new StackAction()); rulesMap.put(new Pattern("*/if"), new IfAction()); rulesMap.put(new Pattern("*/if/then"), new ThenAction()); rulesMap.put(new Pattern("*/if/then/*"), new NOPAction()); rulesMap.put(new Pattern("*/if/else"), new ElseAction()); rulesMap.put(new Pattern("*/if/else/*"), new NOPAction()); + rulesMap.put(new Pattern("x/include"), new IncludeAction()); tc = new TrivialConfigurator(rulesMap); tc.setContext(context); @@ -60,29 +70,24 @@ public class IfThenElseTest { @After public void tearDown() throws Exception { - IncAction.reset(); - } - - @Test - public void if0_Then() throws JoranException { - context.putProperty("Ki1", "Val1"); - tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); - verifyConfig(1); + StatusPrinter.printInCaseOfErrorsOrWarnings(context); + context = null; + StackAction.reset(); } - - @Test - public void if0_Else() throws JoranException { - tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); - StatusPrinter.print(context); - verifyConfig(2); - } - - void verifyConfig(int expected) { - assertEquals(expected, IncAction.beginCount); - assertEquals(expected, IncAction.endCount); + @Test + public void includeNestedWithinIf() throws JoranException { + context.putProperty(THEN_FILE_TO_INCLUDE_KEY, THEN_FILE_TO_INCLUDE); + context.putProperty(ELSE_FILE_TO_INCLUDE_KEY, ELSE_FILE_TO_INCLUDE); + tc.doConfigure(NESTED_INCLUDE_FILE); + verifyConfig(new String[] {"BEGIN", "e0", "IncludedB0", "e1", "END"}); } + void verifyConfig(String[] expected) { + Stack<String> witness = new Stack<String>(); + witness.addAll(Arrays.asList(expected)); + assertEquals(witness, StackAction.stack); + } } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java index bf9aa89..5d3f98b 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java @@ -16,7 +16,9 @@ package ch.qos.logback.core.joran.conditional; import static org.junit.Assert.assertEquals; +import java.util.Arrays; import java.util.HashMap; +import java.util.Stack; import org.junit.After; import org.junit.Before; @@ -27,7 +29,7 @@ import ch.qos.logback.core.ContextBase; import ch.qos.logback.core.joran.TrivialConfigurator; import ch.qos.logback.core.joran.action.Action; import ch.qos.logback.core.joran.action.NOPAction; -import ch.qos.logback.core.joran.action.ext.IncAction; +import ch.qos.logback.core.joran.action.ext.StackAction; import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.testUtil.RandomUtil; @@ -47,7 +49,7 @@ public class IfThenElseTest { public void setUp() throws Exception { HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); rulesMap.put(new Pattern("x"), new NOPAction()); - rulesMap.put(new Pattern("x/inc"), new IncAction()); + rulesMap.put(new Pattern("x/stack"), new StackAction()); rulesMap.put(new Pattern("*/if"), new IfAction()); rulesMap.put(new Pattern("*/if/then"), new ThenAction()); rulesMap.put(new Pattern("*/if/then/*"), new NOPAction()); @@ -60,27 +62,34 @@ public class IfThenElseTest { @After public void tearDown() throws Exception { - IncAction.reset(); + StackAction.reset(); } @Test public void if0_Then() throws JoranException { context.putProperty("Ki1", "Val1"); tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); - verifyConfig(1); + StatusPrinter.printIfErrorsOccured(context); + verifyConfig(new String[] {"BEGIN", "a", "END"}); } @Test public void if0_Else() throws JoranException { tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); - StatusPrinter.print(context); - verifyConfig(2); + verifyConfig(new String[] {"BEGIN", "b", "END"}); } + @Test + public void nestedIf() throws JoranException { + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"nestedIf.xml"); + StatusPrinter.printIfErrorsOccured(context); + verifyConfig(new String[] {"BEGIN", "a", "c", "END"}); + } - void verifyConfig(int expected) { - assertEquals(expected, IncAction.beginCount); - assertEquals(expected, IncAction.endCount); + void verifyConfig(String[] expected) { + Stack<String> witness = new Stack<String>(); + witness.addAll(Arrays.asList(expected)); + assertEquals(witness, StackAction.stack); } diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PackageTest.java similarity index 59% copy from logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java copy to logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PackageTest.java index d65ac45..0a5b973 100644 --- a/logback-core/src/test/java/ch/qos/logback/core/joran/PackageTest.java +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PackageTest.java @@ -11,20 +11,15 @@ * 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.joran; +package ch.qos.logback.core.joran.conditional; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -(a)SuiteClasses({SkippingInInterpreterTest.class, TrivialConfiguratorTest.class, ch.qos.logback.core.joran.action.PackageTest.class, - ch.qos.logback.core.joran.event.PackageTest.class, - ch.qos.logback.core.joran.util.PackageTest.class, - ch.qos.logback.core.joran.spi.PackageTest.class, - ch.qos.logback.core.joran.replay.PackageTest.class, - ch.qos.logback.core.joran.implicitAction.PackageTest.class - }) +@SuiteClasses( { PropertyEvalScriptBuilderTest.class, IfThenElseTest.class, + IfThenElseAndIncludeCompositionTest.class }) public class PackageTest { } diff --git a/logback-core/src/test/resources/asResource/joran/inclusion/includedAsResource.xml b/logback-core/src/test/resources/asResource/joran/inclusion/includedAsResource.xml index 1b80687..e80121e 100644 --- a/logback-core/src/test/resources/asResource/joran/inclusion/includedAsResource.xml +++ b/logback-core/src/test/resources/asResource/joran/inclusion/includedAsResource.xml @@ -3,7 +3,7 @@ <included> - <inc increment="1"/> - <inc increment="1"/> + <stack name="AR_A" /> + <stack name="AR_B" /> </included> \ No newline at end of file ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/conditional/ElseAction.java | 50 +++++--------- .../logback/core/joran/conditional/IfAction.java | 53 +++++++++++--- .../logback/core/joran/conditional/ThenAction.java | 52 +++++--------- .../joran/conditional/ThenOrElseActionBase.java | 76 ++++++++++++++++++++ .../core/joran/spi/InterpretationContext.java | 7 ++ .../ch/qos/logback/core/joran/spi/Interpreter.java | 23 ------ .../src/test/input/joran/conditional/if0.xml | 7 +- .../src/test/input/joran/conditional/if2.xml | 14 ---- .../included.xml => conditional/includedA.xml} | 6 +- .../second.xml => conditional/includedB.xml} | 4 +- .../src/test/input/joran/conditional/nestedIf.xml | 26 +++++++ .../test/input/joran/conditional/nestedInclude.xml | 22 ++++++ .../src/test/input/joran/inclusion/included.xml | 4 +- .../input/joran/inclusion/intermediaryByFile.xml | 8 ++ .../src/test/input/joran/inclusion/second.xml | 2 +- .../src/test/input/joran/inclusion/subByFile.xml | 7 +-- .../ch/qos/logback/core/joran/PackageTest.java | 4 +- .../core/joran/action/IncludeActionTest.java | 61 +++++++--------- .../{StackCounterAction.java => StackAction.java} | 17 ++--- ...va => IfThenElseAndIncludeCompositionTest.java} | 53 ++++++++------ .../core/joran/conditional/IfThenElseTest.java | 27 +++++--- .../conditional}/PackageTest.java | 5 +- .../joran/inclusion/includedAsResource.xml | 4 +- 23 files changed, 318 insertions(+), 214 deletions(-) create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenOrElseActionBase.java delete mode 100644 logback-core/src/test/input/joran/conditional/if2.xml copy logback-core/src/test/input/joran/{inclusion/included.xml => conditional/includedA.xml} (51%) copy logback-core/src/test/input/joran/{inclusion/second.xml => conditional/includedB.xml} (63%) create mode 100644 logback-core/src/test/input/joran/conditional/nestedIf.xml create mode 100644 logback-core/src/test/input/joran/conditional/nestedInclude.xml create mode 100644 logback-core/src/test/input/joran/inclusion/intermediaryByFile.xml rename logback-core/src/test/java/ch/qos/logback/core/joran/action/ext/{StackCounterAction.java => StackAction.java} (73%) copy logback-core/src/test/java/ch/qos/logback/core/joran/conditional/{IfThenElseTest.java => IfThenElseAndIncludeCompositionTest.java} (59%) copy logback-core/src/test/java/ch/qos/logback/core/{helpers => joran/conditional}/PackageTest.java (78%) 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. release_0.9.19-8-gc9f58e8
by git-noreply＠pixie.qos.ch 30 Mar '10

30 Mar '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 c9f58e8f6a1372a08fef830ac1c3e8faa38c5abf (commit) from 199e8d6d8218c1bf526c224e867891110ac0ecbb (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=c9f58e8f6a1372a08fef830a… http://github.com/ceki/logback/commit/c9f58e8f6a1372a08fef830ac1c3e8faa38c5… commit c9f58e8f6a1372a08fef830ac1c3e8faa38c5abf Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Mar 30 14:33:46 2010 +0200 all tests pass diff --git a/logback-classic/src/test/input/joran/conditional/conditionalConsoleApp_ELSE.xml b/logback-classic/src/test/input/joran/conditional/conditionalConsoleApp_ELSE.xml new file mode 100644 index 0000000..426fc24 --- /dev/null +++ b/logback-classic/src/test/input/joran/conditional/conditionalConsoleApp_ELSE.xml @@ -0,0 +1,41 @@ + +<configuration> + + <if condition='property("HOSTNAME").equals("XYZ87")'> + <then> + + <appender name="CON" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d %-5level %logger{35} - %msg %n</pattern> + </encoder> + </appender> + <root> + <appender-ref ref="CON" /> + </root> + + </then> + <else> + + <appender name="LIST" class="ch.qos.logback.core.read.ListAppender"/> + <root> + <appender-ref ref="LIST" /> + </root> + + </else> + </if> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>${randomOutputDir}/conditional.log</file> + <encoder> + <pattern>%d %-5level %logger{35} - %msg %n</pattern> + </encoder> + </appender> + + <root level="ERROR"> + <appender-ref ref="FILE" /> + </root> + + + + +</configuration> \ No newline at end of file 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 5b4b8c7..e9d6a07 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 @@ -110,7 +110,7 @@ public class JaninoEventEvaluatorTest { String k = "key"+diff; MDC.put("key"+diff, "value"+diff); - jee.setExpression("mdc.get(\""+k+"\").contains(\"alue\")"); + jee.setExpression("((String) mdc.get(\""+k+"\")).contains(\"alue\")"); jee.start(); StatusPrinter.printInCaseOfErrorsOrWarnings(loggerContext); diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java index 5ece151..8235d72 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java @@ -17,8 +17,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; - @RunWith(Suite.class) -@SuiteClasses( { JoranConfiguratorTest.class, EvaluatorJoranTest.class}) +@SuiteClasses( { JoranConfiguratorTest.class, EvaluatorJoranTest.class, + ch.qos.logback.classic.joran.conditional.PackageTest.class }) public class PackageTest { } \ No newline at end of file diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java index 0c1329c..be99ad2 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java @@ -14,6 +14,8 @@ package ch.qos.logback.classic.joran.conditional; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.net.InetAddress; @@ -29,6 +31,8 @@ import ch.qos.logback.classic.joran.JoranConfigurator; import ch.qos.logback.core.ConsoleAppender; import ch.qos.logback.core.FileAppender; import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.read.ListAppender; +import ch.qos.logback.core.status.StatusChecker; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; @@ -59,7 +63,7 @@ public class ConditionalTest { } @Test - public void conditionalConsoleApp() throws JoranException, IOException, + public void conditionalConsoleApp_THEN() throws JoranException, IOException, InterruptedException { String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX @@ -71,7 +75,33 @@ public class ConditionalTest { ConsoleAppender consoleAppender = (ConsoleAppender) root.getAppender("CON"); assertNotNull(consoleAppender); StatusPrinter.printIfErrorsOccured(context); + StatusChecker checker = new StatusChecker(context); + assertTrue(checker.isErrorFree()); + } + + @Test + public void conditionalConsoleApp_ELSE() throws JoranException, IOException, + InterruptedException { - + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + + "conditional/conditionalConsoleApp_ELSE.xml"; + configure(configFileAsStr); + + StatusPrinter.print(context); + + + FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); + assertNotNull(fileAppender); + + ConsoleAppender consoleAppender = (ConsoleAppender) root.getAppender("CON"); + assertNull(consoleAppender); + + ListAppender listAppender = (ListAppender) root.getAppender("LIST"); + assertNotNull(listAppender); + + //StatusPrinter.printIfErrorsOccured(context); + StatusChecker checker = new StatusChecker(context); + assertTrue(checker.isErrorFree()); } + } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/PackageTest.java similarity index 85% copy from logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java copy to logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/PackageTest.java index 5ece151..3e1ecce 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/joran/PackageTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/PackageTest.java @@ -11,7 +11,7 @@ * 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.joran; +package ch.qos.logback.classic.joran.conditional; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -19,6 +19,6 @@ import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses( { JoranConfiguratorTest.class, EvaluatorJoranTest.class}) +@SuiteClasses( { ConditionalTest.class}) public class PackageTest { } \ No newline at end of file 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 51aa4df..befbdc3 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 @@ -65,7 +65,8 @@ public class IncludeAction extends Action { // remove the <included> tag from the beginning and </included> from the end trimHeadAndTail(recorder); - ec.getJoranInterpreter().addEventsDynamically(recorder.saxEventList); + // offset = 2, because we need to get past this element as well as the end element + ec.getJoranInterpreter().addEventsDynamically(recorder.saxEventList, 2); } void close(InputStream in) { diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java index 513d350..2c35649 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java @@ -73,14 +73,12 @@ public class IfAction extends Action { listToPlay = elseSaxEventList; } - if (interpreter.pattern.peekLast().equals("if")) { - interpreter.pattern.pop(); - interpreter.play(listToPlay); - interpreter.pattern.push("if"); - } + // insert past this event + interpreter.addEventsDynamically(listToPlay, 1); } + public void setThenSaxEventList(List<SaxEvent> thenSaxEventList) { this.thenSaxEventList = thenSaxEventList; } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java index e29c414..64f7716 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java @@ -9,7 +9,6 @@ import org.codehaus.janino.ClassBodyEvaluator; import org.codehaus.janino.CompileException; import org.codehaus.janino.Parser.ParseException; import org.codehaus.janino.Scanner.ScanException; -import org.junit.Before; import ch.qos.logback.core.spi.ContextAwareBase; @@ -24,7 +23,6 @@ public class PropertyEvalScriptBuilder extends ContextAwareBase { Map<String, String> map = new HashMap<String, String>(); - @Before public Condition build(String script) throws IllegalAccessException, CompileException, ParseException, ScanException, InstantiationException, SecurityException, NoSuchMethodException, IllegalArgumentException, diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java index 7f383f6..528e4fd 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/EventPlayer.java @@ -55,7 +55,7 @@ public class EventPlayer { } } - public void addEventsDynamically(List<SaxEvent> eventList) { - this.eventList.addAll(currentIndex+2, eventList); + public void addEventsDynamically(List<SaxEvent> eventList, int offset) { + this.eventList.addAll(currentIndex+offset, eventList); } } diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java index a19603b..b720312 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/spi/Interpreter.java @@ -72,7 +72,7 @@ public class Interpreter { final private InterpretationContext interpretationContext; final private ArrayList<ImplicitAction> implicitActions; final private CAI_WithLocatorSupport cai; - public Pattern pattern; + private Pattern pattern; Locator locator; EventPlayer player; @@ -102,17 +102,19 @@ public class Interpreter { actionListStack = new Stack<List>(); player = new EventPlayer(this); } - - public void setInterpretationContextPropertiesMap(Map<String, String> propertiesMap) { + + public void setInterpretationContextPropertiesMap( + Map<String, String> propertiesMap) { interpretationContext.setPropertiesMap(propertiesMap); } + /** * @deprecated replaced by {@link #getInterpretationContext()} */ public InterpretationContext getExecutionContext() { return getInterpretationContext(); } - + public InterpretationContext getInterpretationContext() { return interpretationContext; } @@ -149,9 +151,9 @@ public class Interpreter { cai.addError(errMsg); } } - + /** - * This method is used to + * This method is used to */ private void pushEmptyActionList() { actionListStack.add(EMPTY_LIST); @@ -179,10 +181,11 @@ public class Interpreter { } private void endElement(String namespaceURI, String localName, String qName) { - // given that an action list is always pushed for every startElement, we need + // given that an action list is always pushed for every startElement, we + // need // to always pop for every endElement List applicableActionList = (List) actionListStack.pop(); - + if (skip != null) { if (skip.equals(pattern)) { skip = null; @@ -248,7 +251,8 @@ public class Interpreter { // logger.debug("set of applicable patterns: " + applicableActionList); if (applicableActionList == null) { - applicableActionList = lookupImplicitAction(pattern, attributes, interpretationContext); + applicableActionList = lookupImplicitAction(pattern, attributes, + interpretationContext); } return applicableActionList; @@ -328,10 +332,33 @@ public class Interpreter { player.play(eventList); } - public void addEventsDynamically(List<SaxEvent> eventList) { + public void addEventsDynamically(List<SaxEvent> eventList, int offset) { if (player != null) { - player.addEventsDynamically(eventList); + player.addEventsDynamically(eventList, offset); + } + } + + /** + * Pop from the stack if the top most element matches 'name'. Returns whether + * the top most element matched. + * + * @param name + * @return whether the top most element matched 'name' + */ + public boolean popIfMatch(String name) { + boolean match = pattern.peekLast().equals(name); + if (match) { + pattern.pop(); } + return match; + } + + /** + * Intended for internal use. + * @param name + */ + public void patternPush(String name) { + pattern.push(name); } } ----------------------------------------------------------------------- Summary of changes: ...nsoleApp.xml => conditionalConsoleApp_ELSE.xml} | 36 ++++++++++----- .../classic/boolex/JaninoEventEvaluatorTest.java | 2 +- .../ch/qos/logback/classic/joran/PackageTest.java | 4 +- .../classic/joran/conditional/ConditionalTest.java | 34 +++++++++++++- .../classic/joran/conditional}/PackageTest.java | 8 ++-- .../logback/core/joran/action/IncludeAction.java | 3 +- .../logback/core/joran/conditional/IfAction.java | 8 +-- .../conditional/PropertyEvalScriptBuilder.java | 2 - .../ch/qos/logback/core/joran/spi/EventPlayer.java | 4 +- .../ch/qos/logback/core/joran/spi/Interpreter.java | 49 +++++++++++++++---- 10 files changed, 108 insertions(+), 42 deletions(-) copy logback-classic/src/test/input/joran/conditional/{conditionalConsoleApp.xml => conditionalConsoleApp_ELSE.xml} (71%) copy {logback-core/src/test/java/ch/qos/logback/core/helpers => logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional}/PackageTest.java (87%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

if-then-else support in Joran.
by Ceki Gülcü 30 Mar '10

30 Mar '10

Hello all, I began implementing if-then-else support in Joran. If you wish to enable part of a config file in one environment and disable it another, now you can. Here is an example, <configuration> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <encoder> <pattern>%d %-5level %logger{35} - %msg %n</pattern> </encoder> </appender> <root level="DEBUG"> <appender-ref ref="FILE" /> </root> <if condition='property("HOSTNAME").contains("mydevHost")'> <then> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>%d %-5level %logger{35} - %msg %n</pattern> </encoder> </appender> <root incremental="true"> <appender-ref ref="STDOUT" /> </root> </then> </if> </configuration> Thus, the ConsoleAppender will be attached to the root logger only on "mydevHost" but not on other hosts. This feature is still experimental. Your feedback is welcome. -- Ceki

2 3

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. release_0.9.19-7-g199e8d6
by git-noreply＠pixie.qos.ch 29 Mar '10

29 Mar '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 199e8d6d8218c1bf526c224e867891110ac0ecbb (commit) from 2391b73837b528d78505a0b3a339b533b791d283 (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=199e8d6d8218c1bf526c224e… http://github.com/ceki/logback/commit/199e8d6d8218c1bf526c224e867891110ac0e… commit 199e8d6d8218c1bf526c224e867891110ac0ecbb Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 29 22:54:58 2010 +0200 - initial impl of if-then-else support in logback-classes 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 9bc0624..765498a 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 @@ -29,6 +29,9 @@ import ch.qos.logback.core.joran.JoranConfiguratorBase; import ch.qos.logback.core.joran.action.AppenderRefAction; import ch.qos.logback.core.joran.action.IncludeAction; import ch.qos.logback.core.joran.action.NOPAction; +import ch.qos.logback.core.joran.conditional.ElseAction; +import ch.qos.logback.core.joran.conditional.IfAction; +import ch.qos.logback.core.joran.conditional.ThenAction; import ch.qos.logback.core.joran.spi.DefaultNestedComponentRegistry; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.joran.spi.RuleStore; @@ -68,7 +71,14 @@ public class JoranConfigurator extends JoranConfiguratorBase { new AppenderRefAction()); rs.addRule(new Pattern("configuration/root/appender-ref"), new AppenderRefAction()); - + + // add if-then-else support + rs.addRule(new Pattern("*/if"), new IfAction()); + rs.addRule(new Pattern("*/if/then"), new ThenAction()); + rs.addRule(new Pattern("*/if/then/*"), new NOPAction()); + rs.addRule(new Pattern("*/if/else"), new ElseAction()); + rs.addRule(new Pattern("*/if/else/*"), new NOPAction()); + // add jmxConfigurator only if we have JMX available. // If running under JDK 1.4 (retrotranslateed logback) then we // might not have JMX. diff --git a/logback-classic/src/test/input/joran/conditional/conditionalConsoleApp.xml b/logback-classic/src/test/input/joran/conditional/conditionalConsoleApp.xml new file mode 100644 index 0000000..52e2e64 --- /dev/null +++ b/logback-classic/src/test/input/joran/conditional/conditionalConsoleApp.xml @@ -0,0 +1,29 @@ + +<configuration> + + <appender name="FILE" class="ch.qos.logback.core.FileAppender"> + <file>${randomOutputDir}/conditional.log</file> + <encoder> + <pattern>%d %-5level %logger{35} - %msg %n</pattern> + </encoder> + </appender> + + <root level="ERROR"> + <appender-ref ref="FILE" /> + </root> + + + <if condition='property("HOSTNAME").contains("${aHost}")'> + <then> + <appender name="CON" class="ch.qos.logback.core.ConsoleAppender"> + <encoder> + <pattern>%d %-5level %logger{35} - %msg %n</pattern> + </encoder> + </appender> + <root> + <appender-ref ref="CON" /> + </root> + </then> + </if> + +</configuration> \ No newline at end of file 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 07fa46f..6512023 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 @@ -307,8 +307,10 @@ public class JoranConfiguratorTest { assertEquals("UTF-8", encoder.getCharset().displayName()); StatusChecker checker = new StatusChecker(loggerContext); - assertTrue(checker.isErrorFree()); - + assertTrue(checker.isErrorFree()); } + + + } diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java new file mode 100644 index 0000000..0c1329c --- /dev/null +++ b/logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.java @@ -0,0 +1,77 @@ +/** + * 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.joran.conditional; + +import static org.junit.Assert.assertNotNull; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; + +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.classic.ClassicTestConstants; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import ch.qos.logback.classic.joran.JoranConfigurator; +import ch.qos.logback.core.ConsoleAppender; +import ch.qos.logback.core.FileAppender; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.CoreTestConstants; +import ch.qos.logback.core.util.StatusPrinter; + + +public class ConditionalTest { + + LoggerContext context = new LoggerContext(); + Logger root = context.getLogger(Logger.ROOT_LOGGER_NAME); + + + int diff = RandomUtil.getPositiveInt(); + String randomOutputDir = CoreTestConstants.OUTPUT_DIR_PREFIX + diff + "/"; + + @Before + public void setUp() throws UnknownHostException { + context.setName("c"+diff); + context.putProperty("randomOutputDir", randomOutputDir); + InetAddress localhost = InetAddress.getLocalHost(); + context.putProperty("aHost", localhost.getCanonicalHostName()); + } + + + void configure(String file) throws JoranException { + JoranConfigurator jc = new JoranConfigurator(); + jc.setContext(context); + jc.doConfigure(file); + } + + @Test + public void conditionalConsoleApp() throws JoranException, IOException, + InterruptedException { + + String configFileAsStr = ClassicTestConstants.JORAN_INPUT_PREFIX + + "conditional/conditionalConsoleApp.xml"; + configure(configFileAsStr); + FileAppender fileAppender = (FileAppender) root.getAppender("FILE"); + assertNotNull(fileAppender); + + ConsoleAppender consoleAppender = (ConsoleAppender) root.getAppender("CON"); + assertNotNull(consoleAppender); + StatusPrinter.printIfErrorsOccured(context); + + + } +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java b/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java index c66e5b0..2bb626a 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/JoranConfiguratorBase.java @@ -29,7 +29,6 @@ import ch.qos.logback.core.joran.action.ParamAction; import ch.qos.logback.core.joran.action.PropertyAction; import ch.qos.logback.core.joran.action.StatusListenerAction; import ch.qos.logback.core.joran.action.TimestampAction; -import ch.qos.logback.core.joran.conditional.IfAction; import ch.qos.logback.core.joran.spi.InterpretationContext; import ch.qos.logback.core.joran.spi.Interpreter; import ch.qos.logback.core.joran.spi.Pattern; @@ -67,10 +66,6 @@ abstract public class JoranConfiguratorBase extends GenericConfigurator { rs.addRule(new Pattern("configuration/timestamp"), new TimestampAction()); - rs.addRule(new Pattern("*/if"), - new IfAction()); - - // the contextProperty pattern is deprecated. It is undocumented // and will be dropped in future versions of logback rs.addRule(new Pattern("configuration/contextProperty"), diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java index 23eaf7c..513d350 100644 --- a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java @@ -23,9 +23,11 @@ public class IfAction extends Action { throws ActionException { ic.pushObject(this); + Condition condition = null; String conditionAttribute = attributes.getValue(CONDITION_ATTR); if (!OptionHelper.isEmpty(conditionAttribute)) { + conditionAttribute = OptionHelper.substVars(conditionAttribute, context); PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(); pesb.setContext(context); try { ----------------------------------------------------------------------- Summary of changes: .../logback/classic/joran/JoranConfigurator.java | 12 +++- .../joran/conditional/conditionalConsoleApp.xml | 29 ++++++++ .../classic/joran/JoranConfiguratorTest.java | 6 +- .../classic/joran/conditional/ConditionalTest.java | 77 ++++++++++++++++++++ .../logback/core/joran/JoranConfiguratorBase.java | 5 -- .../logback/core/joran/conditional/IfAction.java | 2 + 6 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 logback-classic/src/test/input/joran/conditional/conditionalConsoleApp.xml create mode 100644 logback-classic/src/test/java/ch/qos/logback/classic/joran/conditional/ConditionalTest.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. release_0.9.19-6-g2391b73
by git-noreply＠pixie.qos.ch 29 Mar '10

29 Mar '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 2391b73837b528d78505a0b3a339b533b791d283 (commit) from 1a86d32aba6e17f21c242999dad27916e051ee3d (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=2391b73837b528d78505a0b3… http://github.com/ceki/logback/commit/2391b73837b528d78505a0b3a339b533b791d… commit 2391b73837b528d78505a0b3a339b533b791d283 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Mar 29 20:06:23 2010 +0200 - added missing files for if-then-else support in Joran (this is still ongoing work). diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/Condition.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/Condition.java new file mode 100644 index 0000000..344ffcf --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/Condition.java @@ -0,0 +1,18 @@ +/** + * 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.core.joran.conditional; + +public interface Condition { + public boolean evaluate(); +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java new file mode 100644 index 0000000..63ede3f --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java @@ -0,0 +1,44 @@ +package ch.qos.logback.core.joran.conditional; + +import java.util.ArrayList; +import java.util.List; + +import org.xml.sax.Attributes; + +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.event.InPlayListener; +import ch.qos.logback.core.joran.event.SaxEvent; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.joran.spi.InterpretationContext; + +public class ElseAction extends Action implements InPlayListener { + + List<SaxEvent> saxEventList; + + @Override + public void begin(InterpretationContext ic, String name, Attributes attributes) + throws ActionException { + saxEventList = new ArrayList<SaxEvent>(); + ic.addInPlayListener(this); + } + + @Override + public void end(InterpretationContext ic, String name) throws ActionException { + ic.removeInPlayListener(this); + Object o = ic.peekObject(); + if (o instanceof IfAction) { + IfAction ifAction = (IfAction) o; + removeFirstLastFromList(); + ifAction.setElseSaxEventList(saxEventList); + } + } + + public void inPlay(SaxEvent event) { + saxEventList.add(event); + } + + void removeFirstLastFromList() { + saxEventList.remove(0); + saxEventList.remove(saxEventList.size() - 1); + } +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java new file mode 100644 index 0000000..23eaf7c --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java @@ -0,0 +1,90 @@ +package ch.qos.logback.core.joran.conditional; + +import java.util.List; + +import org.xml.sax.Attributes; + +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.event.SaxEvent; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.joran.spi.InterpretationContext; +import ch.qos.logback.core.joran.spi.Interpreter; +import ch.qos.logback.core.util.OptionHelper; + +public class IfAction extends Action { + private static final String CONDITION_ATTR = "condition"; + + Boolean boolResult; + List<SaxEvent> thenSaxEventList; + List<SaxEvent> elseSaxEventList; + + @Override + public void begin(InterpretationContext ic, String name, Attributes attributes) + throws ActionException { + + ic.pushObject(this); + Condition condition = null; + String conditionAttribute = attributes.getValue(CONDITION_ATTR); + if (!OptionHelper.isEmpty(conditionAttribute)) { + PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(); + pesb.setContext(context); + try { + condition = pesb.build(conditionAttribute); + } catch (Exception e) { + addError("Faield to parse condition ["+conditionAttribute+"]", e); + } + + if(condition!=null) { + boolResult = condition.evaluate(); + } + + } + } + + + @Override + public void end(InterpretationContext ic, String name) throws ActionException { + + Object o = ic.peekObject(); + if (o == null) { + throw new IllegalStateException("Unexpected null object on stack"); + } + if (!(o instanceof IfAction)) { + throw new IllegalStateException("Unexpected object of type [" + + o.getClass() + "] on stack"); + } + + if (o != this) { + throw new IllegalStateException( + "IfAction different then current one on stack"); + } + ic.popObject(); + + if (boolResult == null) { + addError("Failed to determine \"if then else\" result"); + return; + } + + Interpreter interpreter = ic.getJoranInterpreter(); + List<SaxEvent> listToPlay = thenSaxEventList; + if (!boolResult) { + listToPlay = elseSaxEventList; + } + + if (interpreter.pattern.peekLast().equals("if")) { + interpreter.pattern.pop(); + interpreter.play(listToPlay); + interpreter.pattern.push("if"); + } + + } + + public void setThenSaxEventList(List<SaxEvent> thenSaxEventList) { + this.thenSaxEventList = thenSaxEventList; + } + + public void setElseSaxEventList(List<SaxEvent> elseSaxEventList) { + this.elseSaxEventList = elseSaxEventList; + } + +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java new file mode 100644 index 0000000..e20a9ec --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java @@ -0,0 +1,57 @@ +/** + * 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.core.joran.conditional; + +import java.util.HashMap; +import java.util.Map; + +public class MapWrapperForScripts { + public Map map = new HashMap<String, String>(); + public String name; + + + public void setMap(Map map) { + this.map = map; + } + public void setName(String name) { + this.name = name; + } + + public boolean isNull(String k) { + Object o = map.get(k); + if (o instanceof String) { + return false; + } + return (System.getProperty(k) == null); + } + + public String p(String k) { + return property(k); + } + + public String property(String k) { + Object o = map.get(k); + if (o instanceof String) { + return (String) o; + } + String v = System.getProperty(k); + if(v != null) { + return v; + } + System.getProperties(); + return ""; + } + + +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java new file mode 100644 index 0000000..e29c414 --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java @@ -0,0 +1,49 @@ +package ch.qos.logback.core.joran.conditional; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.Map; + +import org.codehaus.janino.ClassBodyEvaluator; +import org.codehaus.janino.CompileException; +import org.codehaus.janino.Parser.ParseException; +import org.codehaus.janino.Scanner.ScanException; +import org.junit.Before; + +import ch.qos.logback.core.spi.ContextAwareBase; + +public class PropertyEvalScriptBuilder extends ContextAwareBase { + + private static String SCRIPT_PREFIX = "" + + "public boolean evaluate() { return "; + private static String SCRIPT_SUFFIX = "" + "; }"; + + static String SCRIPT = "" + + "public boolean eval() { return p(\"Ka\").equals(\"Va\"); }"; + + Map<String, String> map = new HashMap<String, String>(); + + @Before + public Condition build(String script) throws IllegalAccessException, + CompileException, ParseException, ScanException, InstantiationException, + SecurityException, NoSuchMethodException, IllegalArgumentException, + InvocationTargetException { + + ClassBodyEvaluator cbe = new ClassBodyEvaluator(); + cbe.setImplementedTypes(new Class[] { Condition.class }); + cbe.setExtendedType(MapWrapperForScripts.class); + cbe.cook(SCRIPT_PREFIX + script + SCRIPT_SUFFIX); + + Class<?> clazz = cbe.getClazz(); + Condition instance = (Condition) clazz.newInstance(); + Method setMapMethod = clazz.getMethod("setMap", Map.class); + setMapMethod.invoke(instance, context.getCopyOfPropertyMap()); + + Method setNameMethod = clazz.getMethod("setName", String.class); + setNameMethod.invoke(instance, context.getName()); + + return instance; + } + +} diff --git a/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java new file mode 100644 index 0000000..5e5f99b --- /dev/null +++ b/logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java @@ -0,0 +1,46 @@ +package ch.qos.logback.core.joran.conditional; + +import java.util.ArrayList; +import java.util.List; + +import org.xml.sax.Attributes; + +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.event.InPlayListener; +import ch.qos.logback.core.joran.event.SaxEvent; +import ch.qos.logback.core.joran.spi.ActionException; +import ch.qos.logback.core.joran.spi.InterpretationContext; + +public class ThenAction extends Action implements InPlayListener { + + List<SaxEvent> eventList; + + @Override + public void begin(InterpretationContext ic, String name, Attributes attributes) + throws ActionException { + eventList = new ArrayList<SaxEvent>(); + ic.addInPlayListener(this); + } + + @Override + public void end(InterpretationContext ic, String name) throws ActionException { + ic.removeInPlayListener(this); + Object o = ic.peekObject(); + if (o instanceof IfAction) { + IfAction ifAction = (IfAction) o; + removeFirstLastFromList(); + ifAction.setThenSaxEventList(eventList); + } else { + throw new IllegalStateException("Missing IfAction on top of stack"); + } + } + + public void inPlay(SaxEvent event) { + eventList.add(event); + } + + void removeFirstLastFromList() { + eventList.remove(0); + eventList.remove(eventList.size() - 1); + } +} diff --git a/logback-core/src/test/input/joran/conditional/if0.xml b/logback-core/src/test/input/joran/conditional/if0.xml new file mode 100644 index 0000000..0273e59 --- /dev/null +++ b/logback-core/src/test/input/joran/conditional/if0.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<x> + <if condition='p("Ki1").equals("Val1")'> + <then> + <inc increment="1"/> + </then> + <else> + <inc increment="1"/> + <inc increment="1"/> + </else> + </if> +</x> diff --git a/logback-core/src/test/input/joran/conditional/if2.xml b/logback-core/src/test/input/joran/conditional/if2.xml new file mode 100644 index 0000000..bc70e1f --- /dev/null +++ b/logback-core/src/test/input/joran/conditional/if2.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<x> + <if class=""> + <a>asd</a> + <then> + <inc increment="1"/> + </then> + <else> + <inc increment="1"/> + <inc increment="1"/> + </else> + </if> +</x> diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java new file mode 100644 index 0000000..bf9aa89 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java @@ -0,0 +1,88 @@ +/** + * 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.core.joran.conditional; + + +import static org.junit.Assert.assertEquals; + +import java.util.HashMap; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.joran.TrivialConfigurator; +import ch.qos.logback.core.joran.action.Action; +import ch.qos.logback.core.joran.action.NOPAction; +import ch.qos.logback.core.joran.action.ext.IncAction; +import ch.qos.logback.core.joran.spi.JoranException; +import ch.qos.logback.core.joran.spi.Pattern; +import ch.qos.logback.core.testUtil.RandomUtil; +import ch.qos.logback.core.util.CoreTestConstants; +import ch.qos.logback.core.util.StatusPrinter; + +public class IfThenElseTest { + + Context context = new ContextBase(); + TrivialConfigurator tc; + int diff = RandomUtil.getPositiveInt(); + static final String CONDITIONAL_DIR_PREFIX = CoreTestConstants.JORAN_INPUT_PREFIX + + "conditional/"; + + + @Before + public void setUp() throws Exception { + HashMap<Pattern, Action> rulesMap = new HashMap<Pattern, Action>(); + rulesMap.put(new Pattern("x"), new NOPAction()); + rulesMap.put(new Pattern("x/inc"), new IncAction()); + rulesMap.put(new Pattern("*/if"), new IfAction()); + rulesMap.put(new Pattern("*/if/then"), new ThenAction()); + rulesMap.put(new Pattern("*/if/then/*"), new NOPAction()); + rulesMap.put(new Pattern("*/if/else"), new ElseAction()); + rulesMap.put(new Pattern("*/if/else/*"), new NOPAction()); + + tc = new TrivialConfigurator(rulesMap); + tc.setContext(context); + } + + @After + public void tearDown() throws Exception { + IncAction.reset(); + } + + @Test + public void if0_Then() throws JoranException { + context.putProperty("Ki1", "Val1"); + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); + verifyConfig(1); + } + + @Test + public void if0_Else() throws JoranException { + tc.doConfigure(CONDITIONAL_DIR_PREFIX+"if0.xml"); + StatusPrinter.print(context); + verifyConfig(2); + } + + + void verifyConfig(int expected) { + assertEquals(expected, IncAction.beginCount); + assertEquals(expected, IncAction.endCount); + } + + + +} diff --git a/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java new file mode 100644 index 0000000..aab2646 --- /dev/null +++ b/logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java @@ -0,0 +1,74 @@ +package ch.qos.logback.core.joran.conditional; + +import static org.junit.Assert.*; + +import org.junit.Before; +import org.junit.Test; + +import ch.qos.logback.core.Context; +import ch.qos.logback.core.ContextBase; +import ch.qos.logback.core.testUtil.RandomUtil; + +public class PropertyEvalScriptBuilderTest { + + + Context context = new ContextBase(); + PropertyEvalScriptBuilder pesb = new PropertyEvalScriptBuilder(); + int diff = RandomUtil.getPositiveInt(); + + @Before + public void setUp() { + context.setName("c"+diff); + pesb.setContext(context); + } + + @Test + public void existing() throws Exception { + String k = "ka"+diff; + context.putProperty("ka"+diff, "va"); + Condition condition = pesb.build("p(\""+k+"\").contains(\"va\")"); + assertNotNull(condition); + assertTrue(condition.evaluate()); + } + + @Test + public void isNullForExisting() throws Exception { + String k = "ka"+diff; + context.putProperty("ka"+diff, "va"); + Condition condition = pesb.build("isNull(\""+k+"\")"); + assertNotNull(condition); + assertFalse(condition.evaluate()); + } + + + @Test + public void inexistentProperty() throws Exception { + String k = "ka"+diff; + Condition condition = pesb.build("p(\""+k+"\").contains(\"va\")"); + assertNotNull(condition); + assertFalse(condition.evaluate()); + } + + @Test + public void isNullForInexistent() throws Exception { + String k = "ka"+diff; + Condition condition = pesb.build("isNull(\""+k+"\")"); + assertNotNull(condition); + assertTrue(condition.evaluate()); + } + + @Test + public void nameOK() throws Exception { + Condition condition = pesb.build("name.contains(\""+context.getName()+"\")"); + assertNotNull(condition); + assertTrue(condition.evaluate()); + } + + @Test + public void wrongName() throws Exception { + Condition condition = pesb.build("name.contains(\"x\")"); + assertNotNull(condition); + assertFalse(condition.evaluate()); + } + +} ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/conditional/Condition.java | 10 +-- .../logback/core/joran/conditional/ElseAction.java | 44 ++++++++++ .../logback/core/joran/conditional/IfAction.java | 90 ++++++++++++++++++++ .../joran/conditional/MapWrapperForScripts.java | 57 ++++++++++++ .../conditional/PropertyEvalScriptBuilder.java | 49 +++++++++++ .../logback/core/joran/conditional/ThenAction.java | 46 ++++++++++ .../src/test/input/joran/conditional/if0.xml | 13 +++ .../src/test/input/joran/conditional/if2.xml | 14 +++ .../core/joran/conditional/IfThenElseTest.java | 88 +++++++++++++++++++ .../conditional/PropertyEvalScriptBuilderTest.java | 74 ++++++++++++++++ 10 files changed, 479 insertions(+), 6 deletions(-) copy logback-classic/src/main/java/ch/qos/logback/classic/db/names/DBNameResolver.java => logback-core/src/main/java/ch/qos/logback/core/joran/conditional/Condition.java (71%) create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ElseAction.java create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/IfAction.java create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/MapWrapperForScripts.java create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilder.java create mode 100644 logback-core/src/main/java/ch/qos/logback/core/joran/conditional/ThenAction.java create mode 100644 logback-core/src/test/input/joran/conditional/if0.xml create mode 100644 logback-core/src/test/input/joran/conditional/if2.xml create mode 100644 logback-core/src/test/java/ch/qos/logback/core/joran/conditional/IfThenElseTest.java create mode 100644 logback-core/src/test/java/ch/qos/logback/core/joran/conditional/PropertyEvalScriptBuilderTest.java hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0