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/03/03 23:28:55 UTC
logging-log4j2 git commit: [LOG4J2-967] log4j2.component.properties
not read for all properties.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 350dad1b3 -> 7c53af7ce
[LOG4J2-967] log4j2.component.properties not read for all properties.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7c53af7c
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7c53af7c
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7c53af7c
Branch: refs/heads/master
Commit: 7c53af7ced826c71b31e3698f2cb846ac7ddd4f7
Parents: 350dad1
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Mar 3 14:28:52 2015 -0800
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Mar 3 14:28:52 2015 -0800
----------------------------------------------------------------------
log4j-core/.gitignore | 1 +
.../org/apache/logging/log4j/core/async/AsyncLogger.java | 9 +++++----
.../logging/log4j/core/async/AsyncLoggerConfigHelper.java | 3 ++-
.../org/apache/logging/log4j/core/config/LoggerConfig.java | 2 +-
src/changes/changes.xml | 3 +++
5 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c53af7c/log4j-core/.gitignore
----------------------------------------------------------------------
diff --git a/log4j-core/.gitignore b/log4j-core/.gitignore
index 9f0fc21..df2b0e2 100644
--- a/log4j-core/.gitignore
+++ b/log4j-core/.gitignore
@@ -2,3 +2,4 @@
/target/
/.classpath
/.project
+/bin/
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c53af7c/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
index 8d8d656..3c94a27 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
@@ -36,6 +36,7 @@ import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.message.MessageFactory;
import org.apache.logging.log4j.message.TimestampMessage;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.PropertiesUtil;
import com.lmax.disruptor.BlockingWaitStrategy;
import com.lmax.disruptor.ExceptionHandler;
@@ -100,7 +101,7 @@ public class AsyncLogger extends Logger {
abstract String getThreadName(Info info);
static ThreadNameStrategy create() {
- final String name = System.getProperty("AsyncLogger.ThreadNameStrategy", CACHED.name());
+ final String name = PropertiesUtil.getProperties().getStringProperty("AsyncLogger.ThreadNameStrategy", CACHED.name());
try {
return ThreadNameStrategy.valueOf(name);
} catch (final Exception ex) {
@@ -133,7 +134,7 @@ public class AsyncLogger extends Logger {
private static int calculateRingBufferSize() {
int ringBufferSize = RINGBUFFER_DEFAULT_SIZE;
- final String userPreferredRBSize = System.getProperty("AsyncLogger.RingBufferSize",
+ final String userPreferredRBSize = PropertiesUtil.getProperties().getStringProperty("AsyncLogger.RingBufferSize",
String.valueOf(ringBufferSize));
try {
int size = Integer.parseInt(userPreferredRBSize);
@@ -169,7 +170,7 @@ public class AsyncLogger extends Logger {
}
private static WaitStrategy createWaitStrategy() {
- final String strategy = System.getProperty("AsyncLogger.WaitStrategy");
+ final String strategy = PropertiesUtil.getProperties().getStringProperty("AsyncLogger.WaitStrategy");
LOGGER.debug("property AsyncLogger.WaitStrategy={}", strategy);
if ("Sleep".equals(strategy)) {
return new SleepingWaitStrategy();
@@ -183,7 +184,7 @@ public class AsyncLogger extends Logger {
}
private static ExceptionHandler getExceptionHandler() {
- final String cls = System.getProperty("AsyncLogger.ExceptionHandler");
+ final String cls = PropertiesUtil.getProperties().getStringProperty("AsyncLogger.ExceptionHandler");
if (cls == null) {
LOGGER.debug("No AsyncLogger.ExceptionHandler specified");
return null;
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c53af7c/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
index b3b8a93..4e03ec9 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
@@ -25,6 +25,7 @@ import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.jmx.RingBufferAdmin;
import org.apache.logging.log4j.core.util.Integers;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.PropertiesUtil;
import com.lmax.disruptor.BlockingWaitStrategy;
import com.lmax.disruptor.EventFactory;
@@ -144,7 +145,7 @@ class AsyncLoggerConfigHelper {
private static int calculateRingBufferSize() {
int ringBufferSize = RINGBUFFER_DEFAULT_SIZE;
- final String userPreferredRBSize = System.getProperty(
+ final String userPreferredRBSize = PropertiesUtil.getProperties().getStringProperty(
"AsyncLoggerConfig.RingBufferSize",
String.valueOf(ringBufferSize));
try {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c53af7c/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index 1726d1d..fbb575c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -478,7 +478,7 @@ public class LoggerConfig extends AbstractFilterable {
protected static boolean includeLocation(final String includeLocationConfigValue) {
if (includeLocationConfigValue == null) {
final boolean sync = !AsyncLoggerContextSelector.class.getName()
- .equals(System.getProperty(Constants.LOG4J_CONTEXT_SELECTOR));
+ .equals(PropertiesUtil.getProperties().getStringProperty(Constants.LOG4J_CONTEXT_SELECTOR));
return sync;
}
return Boolean.parseBoolean(includeLocationConfigValue);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c53af7c/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 815fc31..665e236 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -36,6 +36,9 @@
<action issue="LOG4J2-968" dev="ggregory" type="fix" due-to="Paul D Johe">
SyslogLayout contains extra space.
</action>
+ <action issue="LOG4J2-967" dev="ggregory" type="fix" due-to="Stefan Wehner">
+ log4j2.component.properties not read for all properties.
+ </action>
</release>
<release version="2.2" date="2015-02-22" description="GA Release 2.2">
<action issue="LOG4J2-938" dev="rpopma" type="fix" due-to="Mauro Molinari">