- logback-dev - mailman3.qos.ch

Why ResilientOutputStreamBase does not write the log message after attempt the recovery?
by Tom Liu 14 Apr '10

14 Apr '10

Hi logback-dev, I wonder why ResilientOutputStreamBase does not try to write the log message after attempt the recovery? What's the consideration here? public void write(byte b[], int off, int len) { if (isPresumedInError()) { if (!recoveryCoordinator.isTooSoon()) { attemptRecovery(); } return; // return regardless of the success of the recovery attempt } try { os.write(b, off, len); postSuccessfulWrite(); } catch (IOException e) { postIOFailure(e); } } Thanks very much, Tom

2 2

[JIRA] Created: (LBGENERAL-28) JMX configurator should be able to use MBeanServers with a domain name
by C Z (JIRA) 09 Apr '10

09 Apr '10

JMX configurator should be able to use MBeanServers with a domain name ---------------------------------------------------------------------- Key: LBGENERAL-28 URL: http://jira.qos.ch/browse/LBGENERAL-28 Project: logback-general Issue Type: New Feature Affects Versions: 0.9.16 Reporter: C Z Assignee: Logback dev list Currently, logback exposes an MBean to provide logging related controls via the inclusion of the following configuration: <jmxConfigurator /> However, this *always* uses the platform mbean server: MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); (can be found in class JMXConfiguratorAction, line# 54). I think it should be able to provide an option to use an MBeanServer with a specific domain, which is provided in the JMX spec. The code needs to use the following: List servers = MBeanServerFactory.findMBeanServer(agentId); and then use the first one, possibly giving a warning if there are multiple. This is crucial for our use-case, especially because we have separate MBeanServers in our web-app environment, and we need each application to use its own MBeanServer with a specific domain. So, all in all, can we add an attribute of some sort, so that we can do the following: <jmxConfigurator agentid="someMbeanServerId"/> and if this is set, the code uses: MBeanServer mbs = MBeanServerFactory.findMBeanServer(agentId).get(0); and otherwise, it does whatever it used to do. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 2

having trouble with logs and rolling over
by Jason Roscoe 09 Apr '10

09 Apr '10

I have the below configuration where I want to have a log file roll over either at midnight or when the log gets to 100MB. We are using logback version 0.9.15 at the moment. Using the below, I'm actually not getting any logging. Could someone help me with this? <?xml version="1.0" encoding="UTF-8"?> <configuration> <appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="RootFileAppender"> <file>/apps/projects/liferay/logs/my-subscriptions.log</file> <append>true</append> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <level>debug</level> </filter> <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">  <fileNamePattern>/apps/projects/liferay/logs/my-subscriptions.%d{yyyy-MM-dd}.%i.log</fileNamePattern> <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">  <maxFileSize>100MB</maxFileSize> </timeBasedFileNamingAndTriggeringPolicy> <maxHistory>30</maxHistory> </rollingPolicy> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%date %p [%c{0}] - %message%n</Pattern> </layout> </appender> <appender class="ch.qos.logback.core.ConsoleAppender" name="RootConsoleAppender"> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <level>info</level> </filter> <layout class="ch.qos.logback.classic.PatternLayout"> <Pattern>%-4r [%t] %-5p %c %x - %m%n</Pattern> </layout> </appender> <root> <level value="debug"/> <appender-ref ref="RootFileAppender"/> <appender-ref ref="RootConsoleAppender"/> </root> </configuration> Thanks ________________________________ Disclaimer: This e-mail message is intended only for the personal use of the recipient(s) named above. If you are not an intended recipient, you may not review, copy or distribute this message. If you have received this communication in error, please notify us immediately by e-mail and delete the original message. This e-mail expresses views only of the sender, which are not to be attributed to Rite Aid Corporation and may not be copied or distributed without this statement.

2 2

[JIRA] Created: (LBCLASSIC-201) Preferably don't call toString() on objects in arguments array
by Donald Graham (JIRA) 07 Apr '10

07 Apr '10

Preferably don't call toString() on objects in arguments array -------------------------------------------------------------- Key: LBCLASSIC-201 URL: http://jira.qos.ch/browse/LBCLASSIC-201 Project: logback-classic Issue Type: Improvement Components: appender Affects Versions: 0.9.19 Environment: Software platform Reporter: Donald Graham Assignee: Logback dev list I'm attempting to use a SocketAppender to send log events over the network to a custom appender hosted by SimpleSocketServer. My custom appender needs to work with my arguments as objects, rather than strings. I noticed that the string representations of my arguments were being passed across the network, and traced through to the code shown below (from ch.qos.logback.classic.spi.LoggingEventVO). Would you consider sending the object's serialized form instead (assuming the object is serializable)? private void writeObject(ObjectOutputStream out) throws IOException { out.defaultWriteObject(); out.writeInt(level.levelInt); if (argumentArray != null) { int len = argumentArray.length; out.writeInt(len); for (int i = 0; i < argumentArray.length; i++) { if (argumentArray[i] != null) { out.writeObject(argumentArray[i].toString()); } else { out.writeObject(NULL_ARGUMENT_ARRAY_ELEMENT); } } } else { out.writeInt(NULL_ARGUMENT_ARRAY); } } -- 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

4 7

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-5-g6e526ff
by git-noreply＠pixie.qos.ch 07 Apr '10

07 Apr '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 6e526ff11d650992626ea5ff20e7f0751c493789 (commit) from 52502aee9297ddb4cd610cb399407f9d99091e84 (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=6e526ff11d650992626ea5ff… http://github.com/ceki/logback/commit/6e526ff11d650992626ea5ff20e7f0751c493… commit 6e526ff11d650992626ea5ff20e7f0751c493789 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Apr 7 09:11:07 2010 +0200 - Minor edits = typo correction in http://logback.qos.ch/manual/configuration.html#fileInclusion diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java similarity index 99% rename from logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java rename to logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java index 09d0102..46ea7b1 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfsTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/net/SerializationPerfTest.java @@ -22,7 +22,7 @@ import ch.qos.logback.classic.net.testObjectBuilders.Builder; import ch.qos.logback.classic.net.testObjectBuilders.TrivialLoggingEventBuilder; import ch.qos.logback.classic.net.testObjectBuilders.MinimalSerBuilder; -public class SerializationPerfsTest extends TestCase { +public class SerializationPerfTest extends TestCase { ObjectOutputStream oos; @@ -197,4 +197,7 @@ public class SerializationPerfsTest extends TestCase { Builder builder = new TrivialLoggingEventBuilder(); runPerfTest(builder, "LoggingEvent object serialization"); } + + + } diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index fc97d64..07760e2 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -71,21 +71,29 @@ <li><a href="http://www.geomajas.org/">Geomajas</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> <td> <ul> + <li><a href="http://code.google.com/p/openmeetings/">OpenMeetings</a></li> <li><a href="http://liftweb.net/">Lift</a></li> <li><a href="http://www.red5.org">Red5</a></li> <li><a href="http://scalate.fusesource.org/">Scalate</a></li> <li><a href="http://sonar.codehaus.org/">Sonar</a></li> + </ul> + </td> + + <td valign="top"> + <ul> <li><a href="http://static.springsource.org/s2-dmserver/2.0.x/user-guide/htmlsingle/user…">SpringSource dm Server</a></li> + <li><a href="http://www.streambase.com/developers/docs/latest/index.html">StreamBase</a></li> <li><a href="http://www.xuggle.com/xuggler/">Xuggler</a></li> </ul> </td> + </tr> </table> <script src="templates/footer.js" type="text/javascript"></script> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 884b58e..7990a48 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1629,8 +1629,8 @@ fileName=myApp.log <b class="green big"></included></b></pre> - <p>Again, if you have note already, please note the mandatory <code - class="big green"><included></code> element.</p> + <p>Again, please note the mandatory + <code class="big green"><included></code> element if you have not already done so.</p> <p>The contents to include can be referenced as a file, as a resource, or as a URL.</p> ----------------------------------------------------------------------- Summary of changes: ...onPerfsTest.java => SerializationPerfTest.java} | 5 ++++- logback-site/src/site/pages/index.html | 10 +++++++++- .../src/site/pages/manual/configuration.html | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) rename logback-classic/src/test/java/ch/qos/logback/classic/net/{SerializationPerfsTest.java => SerializationPerfTest.java} (99%) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[JIRA] Created: (LBCLASSIC-195) Allow TurboFilters to modify events
by Ceki Gulcu (JIRA) 06 Apr '10

06 Apr '10

Allow TurboFilters to modify events ----------------------------------- Key: LBCLASSIC-195 URL: http://jira.qos.ch/browse/LBCLASSIC-195 Project: logback-classic Issue Type: Improvement Components: Other Reporter: Ceki Gulcu Assignee: Ceki Gulcu Priority: Blocker http://qos.ch/pipermail/logback-dev/2010-March/005290.html -- 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

4 24

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-4-g52502ae
by git-noreply＠pixie.qos.ch 06 Apr '10

06 Apr '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 52502aee9297ddb4cd610cb399407f9d99091e84 (commit) from b13f02fb21fc894022416428734030628800dec2 (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=52502aee9297ddb4cd610cb3… http://github.com/ceki/logback/commit/52502aee9297ddb4cd610cb399407f9d99091… commit 52502aee9297ddb4cd610cb399407f9d99091e84 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Tue Apr 6 12:42:57 2010 +0200 minor edits diff --git a/logback-site/src/site/pages/index.html b/logback-site/src/site/pages/index.html index 8d819d9..fc97d64 100644 --- a/logback-site/src/site/pages/index.html +++ b/logback-site/src/site/pages/index.html @@ -58,8 +58,8 @@ <h3>Projects known to rely on logback</h3> - <p>Here is a non-exhaustive list of projects known to depend on - logback, in alphabetical order: + <p>Here is a non-exhaustive list of open-source projects known to + depend on logback, in alphabetical order: </p> <table border="0"> @@ -82,7 +82,8 @@ <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> + dm Server</a></li> + <li><a href="http://www.xuggle.com/xuggler/">Xuggler</a></li> </ul> </td> </tr> diff --git a/logback-site/src/site/pages/manual/configuration.html b/logback-site/src/site/pages/manual/configuration.html index 16f41a9..884b58e 100644 --- a/logback-site/src/site/pages/manual/configuration.html +++ b/logback-site/src/site/pages/manual/configuration.html @@ -1480,8 +1480,7 @@ fileName=myApp.log <p>The general format for conditional statements is shown below.</p> - <pre class="prettyprint source"><configuration> - + <pre class="prettyprint source">  <if condition="some conditional expression"> <then> @@ -1497,9 +1496,7 @@ fileName=myApp.log <else> ... </else> - </if> - -</configuration></pre> + </if></pre> <p>The condition is a java expression where only context properties or system properties are accessible. For a key passed as argument, @@ -1509,7 +1506,9 @@ fileName=myApp.log 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.</p> + avoids the need to to check for null values. If you need to check + whether a property is null, the <code>isNull()</code> method is + provided. For example, you can write <code>isNull("k")</code>.</p> <p>In the next example, the <code>ConsoleAppender</code> will be attached to the root logger, but only if the HOSTNAME is @@ -1546,13 +1545,13 @@ fileName=myApp.log </configuration></pre> - <p>Conditional processing is supported everywhere within the + <p>Conditional processing is supported <em>anywhere</em> within the <code><configuration></code> element. Nested if-then-else 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 + programming language. Consequently, too many conditionals will quickly render your configuration files ungrokable to subsequent - readers of your configuration files, including yourself. + readers, including yourself. </p> ----------------------------------------------------------------------- Summary of changes: logback-site/src/site/pages/index.html | 7 ++++--- .../src/site/pages/manual/configuration.html | 17 ++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-3-gb13f02f
by git-noreply＠pixie.qos.ch 05 Apr '10

05 Apr '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 b13f02fb21fc894022416428734030628800dec2 (commit) from 3bb6bf6908b1c17d58e0dde95aaab36570b063b6 (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=b13f02fb21fc894022416428… http://github.com/ceki/logback/commit/b13f02fb21fc894022416428734030628800d… commit b13f02fb21fc894022416428734030628800dec2 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Apr 5 21:09:51 2010 +0200 Removed superflous import 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 56a802a..da32e3f 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 @@ -40,7 +40,6 @@ import ch.qos.logback.core.joran.spi.JoranException; import ch.qos.logback.core.joran.spi.Pattern; import ch.qos.logback.core.status.Status; import ch.qos.logback.core.status.StatusChecker; -import ch.qos.logback.core.testUtil.Env; import ch.qos.logback.core.testUtil.RandomUtil; import ch.qos.logback.core.util.CoreTestConstants; import ch.qos.logback.core.util.StatusPrinter; ----------------------------------------------------------------------- Summary of changes: .../core/joran/action/IncludeActionTest.java | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v0.9.20-2-g3bb6bf6
by git-noreply＠pixie.qos.ch 05 Apr '10

05 Apr '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 3bb6bf6908b1c17d58e0dde95aaab36570b063b6 (commit) from 7049873cad7045bae59ddc55fa9f6ce699dd5469 (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=3bb6bf6908b1c17d58e0dde9… http://github.com/ceki/logback/commit/3bb6bf6908b1c17d58e0dde95aaab36570b06… commit 3bb6bf6908b1c17d58e0dde95aaab36570b063b6 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Apr 5 21:08:52 2010 +0200 It looks like Windows XP may also throw an IOException instead of UknownHostException according to Tomasz Nurkiewicz. 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 1f31383..56a802a 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 @@ -59,9 +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 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 @@ -89,7 +89,7 @@ public class IncludeActionTest { rulesMap.put(new Pattern("x"), new NOPAction()); rulesMap.put(new Pattern("x/include"), new IncludeAction()); rulesMap.put(new Pattern("x/stack"), new StackAction()); - + tc = new TrivialConfigurator(rulesMap); tc.setContext(context); } @@ -108,21 +108,21 @@ public class IncludeActionTest { public void basicFile() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_FILE); tc.doConfigure(TOP_BY_FILE); - verifyConfig(new String[] {"IA", "IB"}); + verifyConfig(new String[] { "IA", "IB" }); } @Test public void basicResource() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_AS_RESOURCE); tc.doConfigure(INCLUDE_BY_RESOURCE); - verifyConfig(new String[] {"AR_A", "AR_B"}); + 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); - verifyConfig(new String[] {"IA", "IB"}); + verifyConfig(new String[] { "IA", "IB" }); } @Test @@ -178,12 +178,13 @@ public class IncludeActionTest { System.setProperty(INCLUDE_KEY, "http://logback2345.qos.ch"); tc.doConfigure(TOP_BY_URL); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); - StatusChecker sc = new StatusChecker(context.getStatusManager()); + StatusChecker sc = new StatusChecker(context.getStatusManager()); + // OS X throws IOException instead of UnknownHostException // http://jira.qos.ch/browse/LBCORE-129 - if (!Env.isMac()) { - assertTrue(sc.containsException(UnknownHostException.class)); - } + // This behavior has been observed on Windows XP as well + assertTrue(sc.containsException(UnknownHostException.class) + || sc.containsException(IOException.class)); } @Test @@ -196,20 +197,20 @@ public class IncludeActionTest { 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(new String[] {"IA", "IB", "SECOND"}); + verifyConfig(new String[] { "IA", "IB", "SECOND" }); } - + void verifyConfig(String[] expected) { Stack<String> witness = new Stack<String>(); witness.addAll(Arrays.asList(expected)); assertEquals(witness, StackAction.stack); } - + } ----------------------------------------------------------------------- Summary of changes: .../core/joran/action/IncludeActionTest.java | 29 ++++++++++--------- 1 files changed, 15 insertions(+), 14 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, lbcore148, updated. v0.9.20-4-gfeec52c
by git-noreply＠pixie.qos.ch 05 Apr '10

05 Apr '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, lbcore148 has been updated via feec52cdd1dfd7215ced4a857fd4538fa3871b8f (commit) from 7c545298b251c2e1574029b945849816a8986332 (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=feec52cdd1dfd7215ced4a85… http://github.com/ceki/logback/commit/feec52cdd1dfd7215ced4a857fd4538fa3871… commit feec52cdd1dfd7215ced4a857fd4538fa3871b8f Author: Ceki Gulcu <ceki(a)qos.ch> Date: Mon Apr 5 21:05:52 2010 +0200 It looks like Windows XP may also throw an IOException instead of UknownHostException according to Tomasz Nurkiewicz. 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 1f31383..e7e070a 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 @@ -59,9 +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 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 @@ -89,7 +89,7 @@ public class IncludeActionTest { rulesMap.put(new Pattern("x"), new NOPAction()); rulesMap.put(new Pattern("x/include"), new IncludeAction()); rulesMap.put(new Pattern("x/stack"), new StackAction()); - + tc = new TrivialConfigurator(rulesMap); tc.setContext(context); } @@ -108,21 +108,21 @@ public class IncludeActionTest { public void basicFile() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_FILE); tc.doConfigure(TOP_BY_FILE); - verifyConfig(new String[] {"IA", "IB"}); + verifyConfig(new String[] { "IA", "IB" }); } @Test public void basicResource() throws JoranException { System.setProperty(INCLUDE_KEY, INCLUDED_AS_RESOURCE); tc.doConfigure(INCLUDE_BY_RESOURCE); - verifyConfig(new String[] {"AR_A", "AR_B"}); + 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); - verifyConfig(new String[] {"IA", "IB"}); + verifyConfig(new String[] { "IA", "IB" }); } @Test @@ -179,11 +179,12 @@ public class IncludeActionTest { tc.doConfigure(TOP_BY_URL); assertEquals(Status.ERROR, context.getStatusManager().getLevel()); StatusChecker sc = new StatusChecker(context.getStatusManager()); + // OS X throws IOException instead of UnknownHostException // http://jira.qos.ch/browse/LBCORE-129 - if (!Env.isMac()) { - assertTrue(sc.containsException(UnknownHostException.class)); - } + // This behavior has been observed on Windows XP as well + assertTrue(sc.containsException(UnknownHostException.class) + || sc.containsException(IOException.class)); } @Test @@ -196,20 +197,20 @@ public class IncludeActionTest { 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(new String[] {"IA", "IB", "SECOND"}); + verifyConfig(new String[] { "IA", "IB", "SECOND" }); } - + void verifyConfig(String[] expected) { Stack<String> witness = new Stack<String>(); witness.addAll(Arrays.asList(expected)); assertEquals(witness, StackAction.stack); } - + } ----------------------------------------------------------------------- Summary of changes: .../core/joran/action/IncludeActionTest.java | 27 ++++++++++--------- 1 files changed, 14 insertions(+), 13 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0