You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/09/22 09:42:41 UTC
[1/6] logging-log4j2 git commit: Fix Javadoc nit.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 375a1f05e -> 32ebd4bee
Fix Javadoc nit.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1f74a05b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1f74a05b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1f74a05b
Branch: refs/heads/master
Commit: 1f74a05b521292185435ff14339bb063fe2451c9
Parents: ff17718
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 21 21:37:35 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 21 21:37:35 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1f74a05b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index a8092ff..0068a15 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -191,7 +191,6 @@ public final class PatternLayout extends AbstractStringLayout {
/**
* Formats a logging event to a writer.
*
- *
* @param event logging event to be formatted.
* @return The event formatted as a String.
*/
[6/6] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by gg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/32ebd4be
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/32ebd4be
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/32ebd4be
Branch: refs/heads/master
Commit: 32ebd4beec5ef25f76d54b1f053d1b7595005053
Parents: 8ec1596 375a1f0
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 22 00:42:30 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 22 00:42:30 2015 -0700
----------------------------------------------------------------------
src/site/xdoc/manual/customconfig.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[5/6] logging-log4j2 git commit: Refactor StringBuilder ThreadLocal
condtruction for reuse.
Posted by gg...@apache.org.
Refactor StringBuilder ThreadLocal condtruction for reuse.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8ec15963
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8ec15963
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8ec15963
Branch: refs/heads/master
Commit: 8ec15963974bc227ee52cb012f7bc6a9437544ed
Parents: 84974dc
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 22 00:42:14 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 22 00:42:14 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/layout/AbstractStringLayout.java | 9 +++++++++
.../org/apache/logging/log4j/core/layout/PatternLayout.java | 7 +------
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8ec15963/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index 82225b5..395d717 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -45,6 +45,15 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
return null;
}
+ protected static ThreadLocal<StringBuilder> newStringBuilderThreadLocal() {
+ return new ThreadLocal<StringBuilder>() {
+ @Override
+ protected StringBuilder initialValue() {
+ return new StringBuilder(DEFAULT_STRING_BUILDER_SIZE);
+ }
+ };
+ }
+
/**
* The charset for the formatted message.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8ec15963/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index e9674f5..e0f8fad 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -86,12 +86,7 @@ public final class PatternLayout extends AbstractStringLayout {
*/
private final PatternFormatter[] formatters;
- private static ThreadLocal<StringBuilder> strBuilder = new ThreadLocal<StringBuilder>() {
- @Override
- protected StringBuilder initialValue() {
- return new StringBuilder(DEFAULT_STRING_BUILDER_SIZE);
- }
- };
+ private static ThreadLocal<StringBuilder> strBuilder = newStringBuilderThreadLocal();
/**
* Conversion pattern.
[4/6] logging-log4j2 git commit: Refactor ThreadLocal's StringBuilder
default size.
Posted by gg...@apache.org.
Refactor ThreadLocal's StringBuilder default size.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/84974dc7
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/84974dc7
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/84974dc7
Branch: refs/heads/master
Commit: 84974dc761f25e930fe9be9be6cc8d946b578afa
Parents: 79bd64d
Author: ggregory <gg...@apache.org>
Authored: Tue Sep 22 00:39:53 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Sep 22 00:39:53 2015 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/layout/AbstractStringLayout.java | 1 +
.../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/84974dc7/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index 075144b..82225b5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -27,6 +27,7 @@ import org.apache.logging.log4j.core.LogEvent;
public abstract class AbstractStringLayout extends AbstractLayout<String> {
private static final long serialVersionUID = 1L;
+ protected static final int DEFAULT_STRING_BUILDER_SIZE = 1024;
/**
* Converts a String to a byte[].
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/84974dc7/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index dcc7221..e9674f5 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -89,7 +89,7 @@ public final class PatternLayout extends AbstractStringLayout {
private static ThreadLocal<StringBuilder> strBuilder = new ThreadLocal<StringBuilder>() {
@Override
protected StringBuilder initialValue() {
- return new StringBuilder(1024);
+ return new StringBuilder(DEFAULT_STRING_BUILDER_SIZE);
}
};
[3/6] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Posted by gg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/79bd64d1
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/79bd64d1
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/79bd64d1
Branch: refs/heads/master
Commit: 79bd64d1f72820270f149df0590a410b79a14efd
Parents: 5b37c11 93b9a4b
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 21 21:38:42 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 21 21:38:42 2015 -0700
----------------------------------------------------------------------
src/site/site.xml | 1 +
src/site/xdoc/manual/appenders.xml | 6 +++---
src/site/xdoc/manual/layouts.xml.vm | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/6] logging-log4j2 git commit: Javadoc: Use the active voice.
Posted by gg...@apache.org.
Javadoc: Use the active voice.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5b37c114
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5b37c114
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5b37c114
Branch: refs/heads/master
Commit: 5b37c114b9ebe017b3b74dd69aa1c60c2330d1e3
Parents: 1f74a05
Author: ggregory <gg...@apache.org>
Authored: Mon Sep 21 21:38:21 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Sep 21 21:38:21 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/layout/PatternLayout.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5b37c114/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index 0068a15..dcc7221 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -210,7 +210,7 @@ public final class PatternLayout extends AbstractStringLayout {
}
/**
- * Create a PatternParser.
+ * Creates a PatternParser.
* @param config The Configuration.
* @return The PatternParser.
*/
@@ -233,7 +233,7 @@ public final class PatternLayout extends AbstractStringLayout {
}
/**
- * Create a pattern layout.
+ * Creates a pattern layout.
*
* @param pattern
* The pattern. If not specified, defaults to DEFAULT_CONVERSION_PATTERN.