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 2016/02/20 05:03:17 UTC
[1/2] logging-log4j2 git commit: LOG4J2-1285 implement
lmax.LifeCycleAware to capture thread ID immediately when started
Repository: logging-log4j2
Updated Branches:
refs/heads/master cb595f013 -> 6e54d7160
LOG4J2-1285 implement lmax.LifeCycleAware to capture thread ID immediately when started
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/aaf41fdc
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/aaf41fdc
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/aaf41fdc
Branch: refs/heads/master
Commit: aaf41fdc075487ecedb89a3d717ce5b7a906141c
Parents: 9664fe2
Author: rpopma <rp...@apache.org>
Authored: Sat Feb 20 12:58:42 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Feb 20 12:58:42 2016 +0900
----------------------------------------------------------------------
.../core/async/RingBufferLogEventHandler.java | 21 +++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/aaf41fdc/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java
index 19bc4d1..e4a496c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEventHandler.java
@@ -16,6 +16,7 @@
*/
package org.apache.logging.log4j.core.async;
+import com.lmax.disruptor.LifecycleAware;
import com.lmax.disruptor.Sequence;
import com.lmax.disruptor.SequenceReportingEventHandler;
@@ -26,11 +27,12 @@ import com.lmax.disruptor.SequenceReportingEventHandler;
* constructor.
*/
public class RingBufferLogEventHandler implements
- SequenceReportingEventHandler<RingBufferLogEvent> {
+ SequenceReportingEventHandler<RingBufferLogEvent>, LifecycleAware {
private static final int NOTIFY_PROGRESS_THRESHOLD = 50;
private Sequence sequenceCallback;
private int counter;
+ private long threadId = -1;
@Override
public void setSequenceCallback(final Sequence sequenceCallback) {
@@ -52,4 +54,21 @@ public class RingBufferLogEventHandler implements
}
}
+ /**
+ * Returns the thread ID of the background consumer thread, or {@code -1} if the background thread has not started
+ * yet.
+ * @return the thread ID of the background consumer thread, or {@code -1}
+ */
+ public long getThreadId() {
+ return threadId;
+ }
+
+ @Override
+ public void onStart() {
+ threadId = Thread.currentThread().getId();
+ }
+
+ @Override
+ public void onShutdown() {
+ }
}
[2/2] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master'
Posted by rp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6e54d716
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6e54d716
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6e54d716
Branch: refs/heads/master
Commit: 6e54d71601d6b22795d0eba2393167b137af90ca
Parents: aaf41fd cb595f0
Author: rpopma <rp...@apache.org>
Authored: Sat Feb 20 13:03:06 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Feb 20 13:03:06 2016 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/Logger.java | 112 +++++-----
.../message/DefaultFlowMessageFactory.java | 27 ++-
.../logging/log4j/message/FlowMessage.java | 11 +-
.../log4j/message/FlowMessageFactory.java | 9 +-
.../logging/log4j/spi/AbstractLogger.java | 31 +--
.../logging/log4j/util/MessageSupplier.java | 2 +
.../log4j/LoggerMessageSupplierTest.java | 207 -------------------
.../logging/log4j/LoggerSupplierTest.java | 26 +--
.../org/apache/logging/log4j/LoggerTest.java | 78 ++-----
.../logging/log4j/core/PatternSelectorTest.java | 10 +-
.../logging/log4j/jul/AbstractLoggerTest.java | 17 +-
.../logging/log4j/taglib/EntryTagTest.java | 4 +-
.../logging/log4j/taglib/ExitTagTest.java | 6 +-
src/changes/changes.xml | 8 +-
14 files changed, 151 insertions(+), 397 deletions(-)
----------------------------------------------------------------------