September 2011 - logback-dev

[JIRA] Created: (LBCORE-223) Add Case Insensitive Contains Predicate to Joran
by Gordon Dickens (JIRA) 22 Sep '11

22 Sep '11

Add Case Insensitive Contains Predicate to Joran ------------------------------------------------ Key: LBCORE-223 URL: http://jira.qos.ch/browse/LBCORE-223 Project: logback-core Issue Type: Improvement Components: Joran Affects Versions: 0.9.30 Reporter: Gordon Dickens Assignee: Logback dev list Priority: Minor As a developer, it would be helpful to have evaluate a property value with case insensitivity. This issue became apparent when importing properties from a file where a property's value could be true or false. Here another person may put in TRUE or FALSE. To circumvent this, I have to include a comment. -- 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 3

[JIRA] Created: (LBCLASSIC-273) Status messages of StatusManager are not cleared upon call to LoggerContext.reset()
by Joern Huxhorn (JIRA) 22 Sep '11

22 Sep '11

Status messages of StatusManager are not cleared upon call to LoggerContext.reset() ----------------------------------------------------------------------------------- Key: LBCLASSIC-273 URL: http://jira.qos.ch/browse/LBCLASSIC-273 Project: logback-classic Issue Type: Bug Affects Versions: 0.9.28 Reporter: Joern Huxhorn Assignee: Logback dev list See https://github.com/ceki/logback/pull/15 -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.qos.ch/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

2 8

Quick fixes
by Pierre Queinnec 22 Sep '11

22 Sep '11

Hi guys, I have a few fixes that seem to not make it to 0.9.30, namely these ones : http://jira.qos.ch/browse/LBACCESS-25 http://jira.qos.ch/browse/LBCORE-218 http://jira.qos.ch/browse/LBCLASSIC-283 Can anyone review the pull requests and tell me if another patch format is needed maybe? Kind regards, -- Pierre Queinnec

3 2

[JIRA] Created: (LBCORE-222) Type-o on Layouts Page in Conversion
by Gordon Dickens (JIRA) 21 Sep '11

21 Sep '11

Type-o on Layouts Page in Conversion ------------------------------------ Key: LBCORE-222 URL: http://jira.qos.ch/browse/LBCORE-222 Project: logback-core Issue Type: Bug Components: Joran Affects Versions: 0.9.30 Reporter: Gordon Dickens Assignee: Logback dev list Priority: Trivial In the ch.qos.logback.core.joran.conditional.IfAction.java class, at line 66 in the error message "Faield" should be spelled "Failed". -- 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 1

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.30-2-gcdca3a2
by git-noreply＠pixie.qos.ch 21 Sep '11

21 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via cdca3a24519d66a09e86b0dda5913e07b30d8031 (commit) from 0365a87125e3b813a494b1b52a26dadd2cd60518 (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=cdca3a24519d66a09e86b0dd… http://github.com/ceki/logback/commit/cdca3a24519d66a09e86b0dda5913e07b30d8… commit cdca3a24519d66a09e86b0dda5913e07b30d8031 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 21 23:55:34 2011 +0200 fix LBCORE-222 (a typo) 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 97f9c80..ba9ca8a 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 @@ -63,7 +63,7 @@ public class IfAction extends Action { try { condition = pesb.build(conditionAttribute); } catch (Exception e) { - addError("Faield to parse condition ["+conditionAttribute+"]", e); + addError("Failed to parse condition ["+conditionAttribute+"]", e); } if(condition!=null) { diff --git a/logback-site/src/site/pages/download.html b/logback-site/src/site/pages/download.html index d7314e3..15a40a5 100644 --- a/logback-site/src/site/pages/download.html +++ b/logback-site/src/site/pages/download.html @@ -124,7 +124,18 @@ </p> </dd> - +  + <dt> + <a + href="https://github.com/tony19/logback-android">Logback-android</a> + by Tony Trinh. + </dt> + + <dd> + <p>Logback-Android brings the power of Logback to Android. + </p> + </dd> + </dl> <p/> ----------------------------------------------------------------------- Summary of changes: .../logback/core/joran/conditional/IfAction.java | 2 +- logback-site/src/site/pages/download.html | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.30-1-g0365a87
by git-noreply＠pixie.qos.ch 20 Sep '11

20 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via 0365a87125e3b813a494b1b52a26dadd2cd60518 (commit) from e76ec4eb9ec7a28ee1732f04a248e228cad8ecc6 (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=0365a87125e3b813a494b1b5… http://github.com/ceki/logback/commit/0365a87125e3b813a494b1b52a26dadd2cd60… commit 0365a87125e3b813a494b1b52a26dadd2cd60518 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 21 00:28:40 2011 +0200 starting work on 0.9.31 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index a048481..0850d03 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30</version> + <version>0.9.31-SNAPSHOT</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index c420270..c005bda 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30</version> + <version>0.9.31-SNAPSHOT</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index dcfca45..f2e7e49 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30</version> + <version>0.9.31-SNAPSHOT</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index eaab9b9..56fa51f 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30</version> + <version>0.9.31-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index a2c0aef..2d8eea1 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30</version> + <version>0.9.31-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/pom.xml b/pom.xml index 0efbc67..33e54a8 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30</version> + <version>0.9.31-SNAPSHOT</version> <packaging>pom</packaging> <name>Logback-Parent</name> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

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

20 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via e76ec4eb9ec7a28ee1732f04a248e228cad8ecc6 (commit) from b2b1708d9b714af05cf3903e80406467cd6aa0db (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=e76ec4eb9ec7a28ee1732f04… http://github.com/ceki/logback/commit/e76ec4eb9ec7a28ee1732f04a248e228cad8e… commit e76ec4eb9ec7a28ee1732f04a248e228cad8ecc6 Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 21 00:25:39 2011 +0200 release 0.9.30 diff --git a/logback-access/pom.xml b/logback-access/pom.xml index a924a95..a048481 100644 --- a/logback-access/pom.xml +++ b/logback-access/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30-SNAPSHOT</version> + <version>0.9.30</version> </parent> <artifactId>logback-access</artifactId> diff --git a/logback-classic/pom.xml b/logback-classic/pom.xml index 1836d81..c420270 100644 --- a/logback-classic/pom.xml +++ b/logback-classic/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30-SNAPSHOT</version> + <version>0.9.30</version> </parent> <artifactId>logback-classic</artifactId> diff --git a/logback-core/pom.xml b/logback-core/pom.xml index a402b35..dcfca45 100644 --- a/logback-core/pom.xml +++ b/logback-core/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30-SNAPSHOT</version> + <version>0.9.30</version> </parent> <artifactId>logback-core</artifactId> diff --git a/logback-examples/pom.xml b/logback-examples/pom.xml index 6da1272..eaab9b9 100644 --- a/logback-examples/pom.xml +++ b/logback-examples/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30-SNAPSHOT</version> + <version>0.9.30</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/pom.xml b/logback-site/pom.xml index ddd506f..a2c0aef 100644 --- a/logback-site/pom.xml +++ b/logback-site/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30-SNAPSHOT</version> + <version>0.9.30</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/logback-site/src/site/pages/news.html b/logback-site/src/site/pages/news.html index fee2e7a..f41678a 100644 --- a/logback-site/src/site/pages/news.html +++ b/logback-site/src/site/pages/news.html @@ -28,7 +28,7 @@ <hr width="80%" align="center" /> - <h3>September xxx, 2011 - Release of version 0.9.30</h3> + <h3>September 21st, 2011 - Release of version 0.9.30</h3> <p>Archive removal can now deal with prolonged periods of diff --git a/pom.xml b/pom.xml index 417aa20..0efbc67 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-parent</artifactId> - <version>0.9.30-SNAPSHOT</version> + <version>0.9.30</version> <packaging>pom</packaging> <name>Logback-Parent</name> @@ -30,7 +30,7 @@ <properties>  - <slf4j.version>1.6.1</slf4j.version> + <slf4j.version>1.6.2</slf4j.version> <junit.version>4.8.2</junit.version> <janino.version>2.5.10</janino.version> <scala.version>2.9.1</scala.version> ----------------------------------------------------------------------- Summary of changes: logback-access/pom.xml | 2 +- logback-classic/pom.xml | 2 +- logback-core/pom.xml | 2 +- logback-examples/pom.xml | 2 +- logback-site/pom.xml | 2 +- logback-site/src/site/pages/news.html | 2 +- pom.xml | 4 ++-- 7 files changed, 8 insertions(+), 8 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. annotated tag, v_0.9.30, created. v_0.9.30
by git-noreply＠pixie.qos.ch 20 Sep '11

20 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The annotated tag, v_0.9.30 has been created at 235868686906c20841309e459edb3e367e28d7ff (tag) tagging e76ec4eb9ec7a28ee1732f04a248e228cad8ecc6 (commit) replaces v_0.9.29 tagged by Ceki Gulcu on Wed Sep 21 00:26:19 2011 +0200 - Log ----------------------------------------------------------------- tagging as 0.9.30 Alexandre Garnier (1): Allow multiple recipient address in 1 <to> element in SMTPAppender (LBCORE-213) Bruce Mitchener (1): Fix typos. Ceki Gulcu (29): next release will be 0.9.30 Merge branch 'typo_fixes' of git://github.com/datafueled/logback Preparatory work for fixing LBCLASSIC-265. The first step is to detect fixed LBCLASSIC-265 configuration recovery works with included files as well. Fixes LBCLASSIC-265 Merge commit '2b2edb0cc0d0e8c3f8c26a39e40811181aa4f63' blurb about multiple email destinations separated by commas fixing LBCLASSIC-273 Merge pull request #19 from dlibby00/master minor clean up minor edits typo fixes added a link to the logback-akka project typo fixes better implementation for extraFolder method in TimeBasedRollingWithArchiveRemovalTest fix typos reported in LBCLASSIC-288 migrating test to scala ongoing work on LBCORE-147 fixing LBCORE-147 and adding relavant test cases minor improvements LBCLASSIC-263 and LBCLASSIC-292 The getMDC method is deprecated and replaced by getMDCPropertyMap. Merge pull request #17 from chrisdolan/master disallow empty values to be returned by ILoggingEvent#getMDCPropertyMap added missing file fix http://jira.qos.ch/browse/LBCLASSIC-289 documenting rootException/LBCLASSIC-217 - methods appending to a StringBuffer with names such as printX renamed release 0.9.30 Chris Dolan (3): http://jira.qos.ch/browse/LBCLASSIC-275 - LoggingEvent casts to LogbackMDCAdapter without checking fix typo: mdcPropertyMap != null should have been mdcPropertyMap == null proper handling of null MDC in LoggingEvent caching Derek Libby (1): Fix for: Tomasz Nurkiewicz (1): [LBCLASSIC-217] Exception stack trace printing starting from root cause ----------------------------------------------------------------------- hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0

Release of logback v0.9.30
by Ceki Gülcü 20 Sep '11

20 Sep '11

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

1 0

[GIT] Logback: the generic, reliable, fast and flexible logging framework. branch, master, updated. v_0.9.29-35-gb2b1708
by git-noreply＠pixie.qos.ch 20 Sep '11

20 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Logback: the generic, reliable, fast and flexible logging framework.". The branch, master has been updated via b2b1708d9b714af05cf3903e80406467cd6aa0db (commit) from b1e595bcf4ff91adeab7e8825f6de55818b39993 (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=b2b1708d9b714af05cf3903e… http://github.com/ceki/logback/commit/b2b1708d9b714af05cf3903e80406467cd6aa… commit b2b1708d9b714af05cf3903e80406467cd6aa0db Author: Ceki Gulcu <ceki(a)qos.ch> Date: Wed Sep 21 00:05:50 2011 +0200 - methods appending to a StringBuffer with names such as printX renamed as subjoinX - intendation changes diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java index 1fc4f6b..eedc1e6 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/db/DBAppender.java @@ -254,7 +254,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { throws SQLException { StringBuilder buf = new StringBuilder(); - ThrowableProxyUtil.printFirstLine(buf, tp); + ThrowableProxyUtil.subjoinFirstLine(buf, tp); updateExceptionStatement(insertExceptionStatement, buf.toString(), baseIndex++, eventId); @@ -263,7 +263,7 @@ public class DBAppender extends DBAppenderBase<ILoggingEvent> { for (int i = 0; i < stepArray.length - commonFrames; i++) { StringBuilder sb = new StringBuilder(); sb.append(CoreConstants.TAB); - ThrowableProxyUtil.printSTEP(sb, stepArray[i]); + ThrowableProxyUtil.subjoinSTEP(sb, stepArray[i]); updateExceptionStatement(insertExceptionStatement, sb.toString(), baseIndex++, eventId); } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java index 56c43cf..ad6b947 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ExtendedThrowableProxyConverter.java @@ -22,7 +22,7 @@ public class ExtendedThrowableProxyConverter extends ThrowableProxyConverter { @Override protected void extraData(StringBuilder builder, StackTraceElementProxy step) { if (step != null) { - ThrowableProxyUtil.appendPackagingData(builder, step); + ThrowableProxyUtil.subjoinPackagingData(builder, step); } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java index 3ed88e4..7a98dfd 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/RootCauseFirstThrowableProxyConverter.java @@ -1,6 +1,18 @@ +/** + * Logback: the reliable, generic, fast and flexible logging framework. + * Copyright (C) 1999-2011, 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.pattern; -import ch.qos.logback.classic.pattern.ExtendedThrowableProxyConverter; import ch.qos.logback.classic.spi.IThrowableProxy; import ch.qos.logback.classic.spi.StackTraceElementProxy; import ch.qos.logback.classic.spi.ThrowableProxyUtil; @@ -12,43 +24,43 @@ import ch.qos.logback.core.CoreConstants; */ public class RootCauseFirstThrowableProxyConverter extends ExtendedThrowableProxyConverter { - @Override - protected String printThrowableToString(IThrowableProxy tp) { - StringBuilder buf = new StringBuilder(2048); - printRootCauseFirst(tp, buf); - return buf.toString(); - } + @Override + protected String throwableProxyToString(IThrowableProxy tp) { + StringBuilder buf = new StringBuilder(2048); + subjoinRootCauseFirst(tp, buf); + return buf.toString(); + } - private void printRootCauseFirst(IThrowableProxy tp, StringBuilder buf) { - if (tp.getCause() != null) - printRootCauseFirst(tp.getCause(), buf); - printRootCause(tp, buf); - } + private void subjoinRootCauseFirst(IThrowableProxy tp, StringBuilder buf) { + if (tp.getCause() != null) + subjoinRootCauseFirst(tp.getCause(), buf); + subjoinRootCause(tp, buf); + } - private void printRootCause(IThrowableProxy tp, StringBuilder buf) { - ThrowableProxyUtil.printFirstLineRootCauseFirst(buf, tp); - buf.append(CoreConstants.LINE_SEPARATOR); - StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray(); - int commonFrames = tp.getCommonFrames(); + private void subjoinRootCause(IThrowableProxy tp, StringBuilder buf) { + ThrowableProxyUtil.subjoinFirstLineRootCauseFirst(buf, tp); + buf.append(CoreConstants.LINE_SEPARATOR); + StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray(); + int commonFrames = tp.getCommonFrames(); - boolean unrestrictedPrinting = lengthOption > stepArray.length; - int length = (unrestrictedPrinting) ? stepArray.length : lengthOption; + boolean unrestrictedPrinting = lengthOption > stepArray.length; + int length = (unrestrictedPrinting) ? stepArray.length : lengthOption; - int maxIndex = length; - if (commonFrames > 0 && unrestrictedPrinting) { - maxIndex -= commonFrames; - } - - for (int i = 0; i < maxIndex; i++) { - String string = stepArray[i].toString(); - buf.append(CoreConstants.TAB); - buf.append(string); - extraData(buf, stepArray[i]); // allow other data to be added - buf.append(CoreConstants.LINE_SEPARATOR); - } + int maxIndex = length; + if (commonFrames > 0 && unrestrictedPrinting) { + maxIndex -= commonFrames; + } + for (int i = 0; i < maxIndex; i++) { + String string = stepArray[i].toString(); + buf.append(CoreConstants.TAB); + buf.append(string); + extraData(buf, stepArray[i]); // allow other data to be added + buf.append(CoreConstants.LINE_SEPARATOR); } + } + } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java index 3ddb1e5..ba71f6d 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/pattern/ThrowableProxyConverter.java @@ -29,7 +29,7 @@ import ch.qos.logback.core.status.ErrorStatus; /** * Add a stack trace in case the event contains a Throwable. - * + * * @author Ceki Gülcü */ public class ThrowableProxyConverter extends ThrowableHandlingConverter { @@ -72,7 +72,7 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { Context context = getContext(); Map evaluatorMap = (Map) context.getObject(CoreConstants.EVALUATOR_MAP); EventEvaluator<ILoggingEvent> ee = (EventEvaluator<ILoggingEvent>) evaluatorMap - .get(evaluatorStr); + .get(evaluatorStr); addEvaluator(ee); } } @@ -116,14 +116,14 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { errorCount++; if (errorCount < CoreConstants.MAX_ERROR_COUNT) { addError("Exception thrown for evaluator named [" + ee.getName() - + "]", eex); + + "]", eex); } else if (errorCount == CoreConstants.MAX_ERROR_COUNT) { ErrorStatus errorStatus = new ErrorStatus( - "Exception thrown for evaluator named [" + ee.getName() + "].", - this, eex); + "Exception thrown for evaluator named [" + ee.getName() + "].", + this, eex); errorStatus.add(new ErrorStatus( - "This was the last warning about this evaluator's errors." - + "We don't want the StatusManager to get flooded.", this)); + "This was the last warning about this evaluator's errors." + + "We don't want the StatusManager to get flooded.", this)); addStatus(errorStatus); } } @@ -134,21 +134,21 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { } } - return printThrowableToString(tp); - } + return throwableProxyToString(tp); + } - protected String printThrowableToString(IThrowableProxy tp) { - StringBuilder buf = new StringBuilder(32); - IThrowableProxy currentThrowable = tp; - while (currentThrowable != null) { - printThrowableProxy(buf, currentThrowable); - currentThrowable = currentThrowable.getCause(); - } + protected String throwableProxyToString(IThrowableProxy tp) { + StringBuilder buf = new StringBuilder(32); + IThrowableProxy currentThrowable = tp; + while (currentThrowable != null) { + subjoinThrowableProxy(buf, currentThrowable); + currentThrowable = currentThrowable.getCause(); + } return buf.toString(); } - void printThrowableProxy(StringBuilder buf, IThrowableProxy tp) { - ThrowableProxyUtil.printFirstLine(buf, tp); + void subjoinThrowableProxy(StringBuilder buf, IThrowableProxy tp) { + ThrowableProxyUtil.subjoinFirstLine(buf, tp); buf.append(CoreConstants.LINE_SEPARATOR); StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray(); int commonFrames = tp.getCommonFrames(); @@ -172,7 +172,7 @@ public class ThrowableProxyConverter extends ThrowableHandlingConverter { if (commonFrames > 0 && unrestrictedPrinting) { buf.append("\t... ").append(tp.getCommonFrames()).append( - " common frames omitted").append(CoreConstants.LINE_SEPARATOR); + " common frames omitted").append(CoreConstants.LINE_SEPARATOR); } } } diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java index 303ed6e..7476b57 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxy.java @@ -108,7 +108,7 @@ public class ThrowableProxy implements IThrowableProxy { for (StackTraceElementProxy step : stackTraceElementProxyArray) { String string = step.toString(); builder.append(CoreConstants.TAB).append(string); - ThrowableProxyUtil.appendPackagingData(builder, step); + ThrowableProxyUtil.subjoinPackagingData(builder, step); builder.append(CoreConstants.LINE_SEPARATOR); } System.out.println(builder.toString()); diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java index 1283bce..8d76786 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/spi/ThrowableProxyUtil.java @@ -76,15 +76,15 @@ public class ThrowableProxyUtil { StringBuilder sb = new StringBuilder(); while (tp != null) { - printFirstLine(sb, tp); + subjoinFirstLine(sb, tp); sb.append(CoreConstants.LINE_SEPARATOR); - printSTEPArray(sb, tp); + subjoinSTEPArray(sb, tp); tp = tp.getCause(); } return sb.toString(); } - public static void appendPackagingData(StringBuilder builder, StackTraceElementProxy step) { + public static void subjoinPackagingData(StringBuilder builder, StackTraceElementProxy step) { if (step != null) { ClassPackagingData cpd = step.getClassPackagingData(); if (cpd != null) { @@ -100,19 +100,19 @@ public class ThrowableProxyUtil { } } - static public void printSTEP(StringBuilder sb, StackTraceElementProxy step) { + static public void subjoinSTEP(StringBuilder sb, StackTraceElementProxy step) { sb.append(step.toString()); - appendPackagingData(sb, step); + subjoinPackagingData(sb, step); } - static public void printSTEPArray(StringBuilder sb, IThrowableProxy tp) { + static public void subjoinSTEPArray(StringBuilder sb, IThrowableProxy tp) { StackTraceElementProxy[] stepArray = tp.getStackTraceElementProxyArray(); int commonFrames = tp.getCommonFrames(); for (int i = 0; i < stepArray.length - commonFrames; i++) { StackTraceElementProxy step = stepArray[i]; sb.append(CoreConstants.TAB); - printSTEP(sb, step); + subjoinSTEP(sb, step); sb.append(CoreConstants.LINE_SEPARATOR); } @@ -123,22 +123,22 @@ public class ThrowableProxyUtil { } - static public void printFirstLine(StringBuilder buf, IThrowableProxy tp) { + static public void subjoinFirstLine(StringBuilder buf, IThrowableProxy tp) { int commonFrames = tp.getCommonFrames(); if (commonFrames > 0) { buf.append(CoreConstants.CAUSED_BY); } - printExceptionMessage(buf, tp); + subjoinExceptionMessage(buf, tp); } - static public void printFirstLineRootCauseFirst(StringBuilder buf, IThrowableProxy tp) { + static public void subjoinFirstLineRootCauseFirst(StringBuilder buf, IThrowableProxy tp) { if (tp.getCause() != null) { buf.append(CoreConstants.WRAPPED_BY); } - printExceptionMessage(buf, tp); + subjoinExceptionMessage(buf, tp); } - private static void printExceptionMessage(StringBuilder buf, IThrowableProxy tp) { + private static void subjoinExceptionMessage(StringBuilder buf, IThrowableProxy tp) { buf.append(tp.getClassName()).append(": ").append(tp.getMessage()); } } ----------------------------------------------------------------------- Summary of changes: .../java/ch/qos/logback/classic/db/DBAppender.java | 4 +- .../pattern/ExtendedThrowableProxyConverter.java | 2 +- .../RootCauseFirstThrowableProxyConverter.java | 74 +++++++++++-------- .../classic/pattern/ThrowableProxyConverter.java | 38 +++++----- .../ch/qos/logback/classic/spi/ThrowableProxy.java | 2 +- .../logback/classic/spi/ThrowableProxyUtil.java | 24 +++--- 6 files changed, 78 insertions(+), 66 deletions(-) hooks/post-receive -- Logback: the generic, reliable, fast and flexible logging framework.

1 0