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 2015/09/20 10:36:12 UTC
[1/4] logging-log4j2 git commit: LOG4J2-1121 - remove variables that
aren't used
Repository: logging-log4j2
Updated Branches:
refs/heads/master 66b287f46 -> 63323d586
LOG4J2-1121 - remove variables that aren't used
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d140bd94
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d140bd94
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d140bd94
Branch: refs/heads/master
Commit: d140bd948b0a9fd1a260ba79836103df1c8d0325
Parents: a536638
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Sep 19 23:26:23 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Sep 19 23:27:26 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/LockingReliabilityStrategy.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d140bd94/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
index 7bd92a6..82de1fa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
@@ -37,11 +37,6 @@ import org.apache.logging.log4j.util.Supplier;
* and waits for these threads to finish before allowing the appenders to be stopped.
*/
public class LockingReliabilityStrategy implements ReliabilityStrategy {
- private static final int MAX_RETRIES = 3;
- private final AtomicInteger counter = new AtomicInteger();
- private final AtomicBoolean shutdown = new AtomicBoolean(false);
- private final Lock shutdownLock = new ReentrantLock();
- private final Condition noLogEvents = shutdownLock.newCondition(); // should only be used when shutdown == true
private final LoggerConfig loggerConfig;
private final ReadWriteLock reconfigureLock = new ReentrantReadWriteLock();
private volatile boolean isStopping = false;
[2/4] logging-log4j2 git commit: LOG4J2-1121 - Remove unused imports
Posted by rp...@apache.org.
LOG4J2-1121 - Remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2da0091a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2da0091a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2da0091a
Branch: refs/heads/master
Commit: 2da0091aca3bcbeff04953deef9556bf27982bc8
Parents: d140bd9
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Sep 19 23:30:36 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Sep 19 23:30:36 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/LockingReliabilityStrategy.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2da0091a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
index 82de1fa..b623f65 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
@@ -18,12 +18,7 @@
package org.apache.logging.log4j.core.config;
import java.util.Objects;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.logging.log4j.Level;
[3/4] logging-log4j2 git commit: LOG4J2-1121 Update javadoc comment
Posted by rp...@apache.org.
LOG4J2-1121 Update javadoc comment
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/beb9e8c3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/beb9e8c3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/beb9e8c3
Branch: refs/heads/master
Commit: beb9e8c3c5f24b48fb88e510ccd86afcfbb3700a
Parents: 2da0091
Author: Ralph Goers <rg...@nextiva.com>
Authored: Sat Sep 19 23:33:40 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sat Sep 19 23:33:40 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/LockingReliabilityStrategy.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/beb9e8c3/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
index b623f65..f518ba1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LockingReliabilityStrategy.java
@@ -28,8 +28,7 @@ import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.util.Supplier;
/**
- * ReliabilityStrategy that counts the number of threads that have started to log an event but have not completed yet,
- * and waits for these threads to finish before allowing the appenders to be stopped.
+ * ReliabilityStrategy that uses read/write locks to prevent the LoggerConfig from stopping while it is in use.
*/
public class LockingReliabilityStrategy implements ReliabilityStrategy {
private final LoggerConfig loggerConfig;
[4/4] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1121B-ReliabilityStrategy
Posted by rp...@apache.org.
Merge branch 'master' into LOG4J2-1121B-ReliabilityStrategy
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/63323d58
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/63323d58
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/63323d58
Branch: refs/heads/master
Commit: 63323d5866bcc62f8d5c4832119f4c2b0638c8d9
Parents: beb9e8c 66b287f
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 20 10:34:32 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 20 10:34:32 2015 +0200
----------------------------------------------------------------------
.../log4j/core/layout/PatternLayout.java | 20 +++++++++++++++-----
src/changes/changes.xml | 7 +++++++
2 files changed, 22 insertions(+), 5 deletions(-)
----------------------------------------------------------------------