You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2014/03/23 10:05:18 UTC
svn commit: r1580474 - in /logging/log4j/log4j2/trunk:
log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
src/changes/changes.xml
Author: rpopma
Date: Sun Mar 23 09:05:17 2014
New Revision: 1580474
URL: http://svn.apache.org/r1580474
Log:
LOG4J2-574 Make Blocking the default WaitStrategy for Async Loggers
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java?rev=1580474&r1=1580473&r2=1580474&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLogger.java Sun Mar 23 09:05:17 2014
@@ -172,17 +172,14 @@ public class AsyncLogger extends Logger
final String strategy = System.getProperty("AsyncLogger.WaitStrategy");
LOGGER.debug("property AsyncLogger.WaitStrategy={}", strategy);
if ("Sleep".equals(strategy)) {
- LOGGER.debug("disruptor event handler uses SleepingWaitStrategy");
return new SleepingWaitStrategy();
} else if ("Yield".equals(strategy)) {
- LOGGER.debug("disruptor event handler uses YieldingWaitStrategy");
return new YieldingWaitStrategy();
} else if ("Block".equals(strategy)) {
- LOGGER.debug("disruptor event handler uses BlockingWaitStrategy");
return new BlockingWaitStrategy();
}
- LOGGER.debug("disruptor event handler uses SleepingWaitStrategy");
- return new SleepingWaitStrategy();
+ LOGGER.debug("disruptor event handler uses BlockingWaitStrategy");
+ return new BlockingWaitStrategy();
}
private static ExceptionHandler getExceptionHandler() {
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java?rev=1580474&r1=1580473&r2=1580474&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfigHelper.java Sun Mar 23 09:05:17 2014
@@ -139,7 +139,8 @@ class AsyncLoggerConfigHelper {
} else if ("Block".equals(strategy)) {
return new BlockingWaitStrategy();
}
- return new SleepingWaitStrategy();
+ LOGGER.debug("disruptor event handler uses BlockingWaitStrategy");
+ return new BlockingWaitStrategy();
}
private static int calculateRingBufferSize() {
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1580474&r1=1580473&r2=1580474&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sun Mar 23 09:05:17 2014
@@ -21,6 +21,9 @@
</properties>
<body>
<release version="2.0-rc2?" date="2014-MM-DD" description="Bug fixes and enhancements">
+ <action issue="LOG4J2-574" dev="rpopma" type="update">
+ Make Blocking the default WaitStrategy for Async Loggers.
+ </action>
<action issue="LOG4J2-555" dev="rpopma" type="update">
Introduce LoggerProvider interface to facilitate implementing and extending Loggers.
</action>