LOG4J2-1274 moved CharBuffer size from TextEncoderHelper to Constants, improved Constants docs
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7a9d18c3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7a9d18c3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7a9d18c3 Branch: refs/heads/LOG4J2-1365 Commit: 7a9d18c3e4a31b64633b5a755a4e9bce29d3ba32 Parents: a743e8e Author: rpopma <[email protected]> Authored: Sun Apr 17 14:52:24 2016 +0900 Committer: rpopma <[email protected]> Committed: Sun Apr 17 14:52:24 2016 +0900 ---------------------------------------------------------------------- .../core/layout/LockingStringBuilderEncoder.java | 3 ++- .../log4j/core/layout/StringBuilderEncoder.java | 3 ++- .../log4j/core/layout/TextEncoderHelper.java | 1 - .../apache/logging/log4j/core/util/Constants.java | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a9d18c3/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LockingStringBuilderEncoder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LockingStringBuilderEncoder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LockingStringBuilderEncoder.java index 6224175..e6086c9 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LockingStringBuilderEncoder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/LockingStringBuilderEncoder.java @@ -1,5 +1,6 @@ package org.apache.logging.log4j.core.layout; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.status.StatusLogger; import java.nio.CharBuffer; @@ -18,7 +19,7 @@ public class LockingStringBuilderEncoder implements Encoder<StringBuilder> { private final CharBuffer cachedCharBuffer; public LockingStringBuilderEncoder(final Charset charset) { - this(charset, TextEncoderHelper.DEFAULT_CHAR_BUFFER_SIZE); + this(charset, Constants.ENCODER_CHAR_BUFFER_SIZE); } public LockingStringBuilderEncoder(final Charset charset, final int charBufferSize) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a9d18c3/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java index 22cb1b5..abb5c96 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/StringBuilderEncoder.java @@ -1,5 +1,6 @@ package org.apache.logging.log4j.core.layout; +import org.apache.logging.log4j.core.util.Constants; import org.apache.logging.log4j.status.StatusLogger; import java.nio.ByteBuffer; @@ -23,7 +24,7 @@ public class StringBuilderEncoder implements Encoder<StringBuilder> { private final int byteBufferSize; public StringBuilderEncoder(final Charset charset) { - this(charset, TextEncoderHelper.DEFAULT_CHAR_BUFFER_SIZE, DEFAULT_BYTE_BUFFER_SIZE); + this(charset, Constants.ENCODER_CHAR_BUFFER_SIZE, DEFAULT_BYTE_BUFFER_SIZE); } public StringBuilderEncoder(final Charset charset, final int charBufferSize, final int byteBufferSize) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a9d18c3/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java index 09a49d8..7d27830 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/TextEncoderHelper.java @@ -29,7 +29,6 @@ import java.nio.charset.CoderResult; * @since 2.6 */ public class TextEncoderHelper { - static final int DEFAULT_CHAR_BUFFER_SIZE = 2048; private TextEncoderHelper() { } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7a9d18c3/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java index 95bd03e..e1f175b 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/Constants.java @@ -108,15 +108,33 @@ public final class Constants { /** * Initial StringBuilder size used in RingBuffer LogEvents to store the contents of reusable Messages. + * <p> + * The default value is {@value}, users can override with system property "log4j.initialReusableMsgSize". + * </p> + * @since 2.6 */ public static final int INITIAL_REUSABLE_MESSAGE_SIZE = size("log4j.initialReusableMsgSize", 128); /** * Maximum size of the StringBuilders used in RingBuffer LogEvents to store the contents of reusable Messages. * After a large message has been delivered to the appenders, the StringBuilder is trimmed to this size. + * <p> + * The default value is {@value}, which allows the StringBuilder to resize three times from its initial size. + * Users can override with system property "log4j.maxReusableMsgSize". + * </p> + * @since 2.6 */ public static final int MAX_REUSABLE_MESSAGE_SIZE = size("log4j.maxReusableMsgSize", (128 * 2 + 2) * 2 + 2); + /** + * Size of CharBuffers used by text encoders. + * <p> + * The default value is {@value}, users can override with system property "log4j.encoder.charBufferSize". + * </p> + * @since 2.6 + */ + public static final int ENCODER_CHAR_BUFFER_SIZE = size("log4j.encoder.charBufferSize", 2048); + private static int size(final String property, final int defaultValue) { return PropertiesUtil.getProperties().getIntegerProperty(property, defaultValue); }
