You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2018/07/27 15:44:43 UTC
[4/7] logging-log4j2 git commit: ExtendedThrowablePatternConverter
writes to the layout buffer
ExtendedThrowablePatternConverter writes to the layout buffer
ExtendedThrowablePatternConverter no longer constructs a String
of the full stack trace, instead appending to the layout
StringBuilder.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/69dc0492
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/69dc0492
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/69dc0492
Branch: refs/heads/release-2.x
Commit: 69dc0492816a2f1c0417a986dd8f2dc90db732d1
Parents: 33d5d78
Author: Carter Kozak <ck...@apache.org>
Authored: Wed Jul 25 19:06:06 2018 -0400
Committer: Carter Kozak <ck...@apache.org>
Committed: Fri Jul 27 11:39:13 2018 -0400
----------------------------------------------------------------------
.../logging/log4j/core/impl/ThrowableProxy.java | 15 ++++++++++++++-
.../pattern/ExtendedThrowablePatternConverter.java | 6 ++----
2 files changed, 16 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/69dc0492/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
index 111ff71..73d7faf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
@@ -505,6 +505,20 @@ public class ThrowableProxy implements Serializable {
*/
public String getExtendedStackTraceAsString(final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
final StringBuilder sb = new StringBuilder(1024);
+ formatExtendedStackTraceTo(sb, ignorePackages, textRenderer, suffix, lineSeparator);
+ return sb.toString();
+ }
+
+ /**
+ * Formats the stack trace including packaging information.
+ *
+ * @param sb Destination.
+ * @param ignorePackages List of packages to be ignored in the trace.
+ * @param textRenderer The message renderer.
+ * @param suffix Append this to the end of each stack frame.
+ * @param lineSeparator The end-of-line separator.
+ */
+ public void formatExtendedStackTraceTo(final StringBuilder sb, final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix, final String lineSeparator) {
textRenderer.render(name, sb, "Name");
textRenderer.render(": ", sb, "NameMessageSeparator");
textRenderer.render(this.message, sb, "Message");
@@ -514,7 +528,6 @@ public class ThrowableProxy implements Serializable {
this.formatElements(sb, Strings.EMPTY, 0, causedTrace, this.extendedStackTrace, ignorePackages, textRenderer, suffix, lineSeparator);
this.formatSuppressed(sb, TAB, this.suppressedProxies, ignorePackages, textRenderer, suffix, lineSeparator);
this.formatCause(sb, Strings.EMPTY, this.causeProxy, ignorePackages, textRenderer, suffix, lineSeparator);
- return sb.toString();
}
public String getLocalizedMessage() {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/69dc0492/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
index 3196758..8ec9b7d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ExtendedThrowablePatternConverter.java
@@ -20,7 +20,6 @@ import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.plugins.Plugin;
import org.apache.logging.log4j.core.impl.ThrowableProxy;
-import org.apache.logging.log4j.util.Strings;
/**
* Outputs the Throwable portion of the LoggingEvent as a full stack trace
@@ -68,13 +67,12 @@ public final class ExtendedThrowablePatternConverter extends ThrowablePatternCon
super.format(event, toAppendTo);
return;
}
- final String extStackTrace = proxy.getExtendedStackTraceAsString(options.getIgnorePackages(),
- options.getTextRenderer(), getSuffix(event), options.getSeparator());
final int len = toAppendTo.length();
if (len > 0 && !Character.isWhitespace(toAppendTo.charAt(len - 1))) {
toAppendTo.append(' ');
}
- toAppendTo.append(extStackTrace);
+ proxy.formatExtendedStackTraceTo(toAppendTo, options.getIgnorePackages(),
+ options.getTextRenderer(), getSuffix(event), options.getSeparator());
}
}