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 07:40:18 UTC
[1/4] logging-log4j2 git commit: LOG4J2-1121 bugfixes
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1121B-ReliabilityStrategy d524ef3e1 -> a536638af
LOG4J2-1121 bugfixes
- Unconditional waiting strategy sleep time must be non-zero
- Make unconditional wait time user-configurable
- AwaitCompletionReliabilityStrategy only accepts non-null LoggerConfig
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3825b086
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3825b086
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3825b086
Branch: refs/heads/LOG4J2-1121B-ReliabilityStrategy
Commit: 3825b08615446c0ca014d0e8415cdd0a5e022dd2
Parents: d524ef3
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 20 14:09:57 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 20 14:09:57 2015 +0900
----------------------------------------------------------------------
.../core/config/AwaitCompletionReliabilityStrategy.java | 3 ++-
.../config/AwaitUnconditionallyReliabilityStrategy.java | 9 ++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3825b086/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java
index 90a1108..4251cfa 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitCompletionReliabilityStrategy.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.config;
+import java.util.Objects;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -43,7 +44,7 @@ public class AwaitCompletionReliabilityStrategy implements ReliabilityStrategy {
private final LoggerConfig loggerConfig;
public AwaitCompletionReliabilityStrategy(final LoggerConfig loggerConfig) {
- this.loggerConfig = loggerConfig;
+ this.loggerConfig = Objects.requireNonNull(loggerConfig, "loggerConfig is null");
}
/* (non-Javadoc)
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3825b086/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
index 5f8c204..750af31 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AwaitUnconditionallyReliabilityStrategy.java
@@ -24,6 +24,7 @@ import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.status.StatusLogger;
+import org.apache.logging.log4j.util.PropertiesUtil;
import org.apache.logging.log4j.util.Supplier;
/**
@@ -31,12 +32,18 @@ import org.apache.logging.log4j.util.Supplier;
*/
public class AwaitUnconditionallyReliabilityStrategy implements ReliabilityStrategy {
- private static final long SLEEP_MILLIS = 0;
+ private static final long DEFAULT_SLEEP_MILLIS = 5000; // 5 seconds
+ private static final long SLEEP_MILLIS = sleepMillis();
private final LoggerConfig loggerConfig;
public AwaitUnconditionallyReliabilityStrategy(final LoggerConfig loggerConfig) {
this.loggerConfig = Objects.requireNonNull(loggerConfig, "loggerConfig is null");
}
+
+ private static long sleepMillis() {
+ return PropertiesUtil.getProperties().getLongProperty("log4j.waitMillisBeforeStopOldConfig",
+ DEFAULT_SLEEP_MILLIS);
+ }
/*
* (non-Javadoc)
[2/4] logging-log4j2 git commit: LOG4J2-1121 handle programmatic
reconfiguration
Posted by rp...@apache.org.
LOG4J2-1121 handle programmatic reconfiguration
- ReliabilityStrategyFactory is now a concrete class that uses system
properties to determine which ReliabilityStrategy implementation to
return
- ConfigurationMonitor implementations now delegates to
ReliabilityStrategyFactory
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c5304b50
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c5304b50
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c5304b50
Branch: refs/heads/LOG4J2-1121B-ReliabilityStrategy
Commit: c5304b50817fbd7d7a8e2f8682320e9f2672084c
Parents: 3825b08
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 20 14:13:37 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 20 14:13:37 2015 +0900
----------------------------------------------------------------------
.../log4j/core/config/ConfigurationMonitor.java | 11 ++++++++-
.../config/DefaultConfigurationMonitor.java | 2 +-
.../core/config/FileConfigurationMonitor.java | 2 +-
.../core/config/ReliabilityStrategyFactory.java | 25 ++++++++++++++++++--
4 files changed, 35 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5304b50/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationMonitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationMonitor.java
index 3fc3d03..44c803d 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationMonitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationMonitor.java
@@ -19,10 +19,19 @@ package org.apache.logging.log4j.core.config;
/**
* Interface that must be implemented to provide notification of configuration changes.
*/
-public interface ConfigurationMonitor extends ReliabilityStrategyFactory {
+public interface ConfigurationMonitor {
/**
* Called to determine if the configuration has changed.
*/
void checkConfiguration();
+
+ /**
+ * Determines how to log events reliably during or after a configuration change.
+ *
+ * @param loggerConfig the LoggerConfig the resulting {@code ReliabilityStrategy} is associated with
+ * @return a ReliabilityStrategy that helps the specified LoggerConfig to log events reliably during or after a
+ * configuration change
+ */
+ ReliabilityStrategy getReliabilityStrategy(final LoggerConfig loggerConfig);
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5304b50/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java
index f52cfa7..a61cee1 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/DefaultConfigurationMonitor.java
@@ -34,6 +34,6 @@ public class DefaultConfigurationMonitor implements ConfigurationMonitor {
*/
@Override
public ReliabilityStrategy getReliabilityStrategy(LoggerConfig loggerConfig) {
- return new DefaultReliabilityStrategy(loggerConfig);
+ return ReliabilityStrategyFactory.getReliabilityStrategy(loggerConfig);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5304b50/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
index 8e95036..d0775d0 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/FileConfigurationMonitor.java
@@ -113,6 +113,6 @@ public class FileConfigurationMonitor implements ConfigurationMonitor {
*/
@Override
public ReliabilityStrategy getReliabilityStrategy(LoggerConfig loggerConfig) {
- return new AwaitCompletionReliabilityStrategy(loggerConfig);
+ return ReliabilityStrategyFactory.getReliabilityStrategy(loggerConfig);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5304b50/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
index 2a9dab5..cdbb312 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
@@ -17,9 +17,30 @@
package org.apache.logging.log4j.core.config;
+import org.apache.logging.log4j.util.PropertiesUtil;
+
/**
* Factory for ReliabilityStrategies.
*/
-public interface ReliabilityStrategyFactory {
- ReliabilityStrategy getReliabilityStrategy(final LoggerConfig loggerConfig);
+public class ReliabilityStrategyFactory {
+ private ReliabilityStrategyFactory() {
+ }
+
+ /**
+ * Returns a new {@code AwaitUnconditionallyReliabilityStrategy} if system property
+ * {@code log4j.alwaysWaitBeforeStopOldConfig} was set to {@code true}, otherwise (by default return) a new
+ * {@code AwaitCompletionReliabilityStrategy} instance.
+ *
+ * @param loggerConfig the LoggerConfig the resulting {@code ReliabilityStrategy} is associated with
+ * @return a ReliabilityStrategy that helps the specified LoggerConfig to log events reliably during or after a
+ * configuration change
+ */
+ public static ReliabilityStrategy getReliabilityStrategy(final LoggerConfig loggerConfig) {
+ boolean waitUnconditionally = PropertiesUtil.getProperties().getBooleanProperty(
+ "log4j.alwaysWaitBeforeStopOldConfig", false);
+ if (waitUnconditionally) {
+ return new AwaitUnconditionallyReliabilityStrategy(loggerConfig);
+ }
+ return new AwaitCompletionReliabilityStrategy(loggerConfig);
+ }
}
[3/4] logging-log4j2 git commit: LOG4J2-1121 organized imports,
validate constructor parameter
Posted by rp...@apache.org.
LOG4J2-1121 organized imports, validate constructor parameter
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ef5c4a9b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ef5c4a9b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ef5c4a9b
Branch: refs/heads/LOG4J2-1121B-ReliabilityStrategy
Commit: ef5c4a9b625099901d0fea66c0a2c3d060f9f3da
Parents: c5304b5
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 20 07:37:45 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 20 07:37:45 2015 +0200
----------------------------------------------------------------------
.../core/config/LockingReliabilityStrategy.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ef5c4a9b/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 9ba74e0..7bd92a6 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
@@ -17,17 +17,21 @@
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;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.message.Message;
import org.apache.logging.log4j.util.Supplier;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.*;
-
/**
* 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.
@@ -43,7 +47,7 @@ public class LockingReliabilityStrategy implements ReliabilityStrategy {
private volatile boolean isStopping = false;
public LockingReliabilityStrategy(final LoggerConfig loggerConfig) {
- this.loggerConfig = loggerConfig;
+ this.loggerConfig = Objects.requireNonNull(loggerConfig, "loggerConfig was null");
}
/* (non-Javadoc)
[4/4] logging-log4j2 git commit: LOG4J2-1121 change factory
Posted by rp...@apache.org.
LOG4J2-1121 change factory
- users can select strategy by name
- Locking reliability strategy is now one of the options
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a536638a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a536638a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a536638a
Branch: refs/heads/LOG4J2-1121B-ReliabilityStrategy
Commit: a536638af36b73aeab21d0cda58e9645925c8efe
Parents: ef5c4a9
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 20 07:40:00 2015 +0200
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 20 07:40:00 2015 +0200
----------------------------------------------------------------------
.../core/config/ReliabilityStrategyFactory.java | 37 ++++++++++++++++----
1 file changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a536638a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
index cdbb312..8fd9458 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/ReliabilityStrategyFactory.java
@@ -17,6 +17,7 @@
package org.apache.logging.log4j.core.config;
+import org.apache.logging.log4j.status.StatusLogger;
import org.apache.logging.log4j.util.PropertiesUtil;
/**
@@ -27,20 +28,42 @@ public class ReliabilityStrategyFactory {
}
/**
- * Returns a new {@code AwaitUnconditionallyReliabilityStrategy} if system property
- * {@code log4j.alwaysWaitBeforeStopOldConfig} was set to {@code true}, otherwise (by default return) a new
- * {@code AwaitCompletionReliabilityStrategy} instance.
+ * Returns a new {@code ReliabilityStrategy} instance based on the value of system property
+ * {@code log4j.ReliabilityStrategy}. If not value was specified this method returns a new
+ * {@code AwaitUnconditionallyReliabilityStrategy}.
+ * <p>
+ * Valid values for this system property are {@code "AwaitUnconditionally"} (use
+ * {@code AwaitUnconditionallyReliabilityStrategy}), {@code "Locking"} (use {@code LockingReliabilityStrategy}) and
+ * {@code "AwaitCompletion"} (use the default {@code AwaitCompletionReliabilityStrategy}).
+ * <p>
+ * Users may also use this system property to specify the fully qualified class name of a class that implements the
+ * {@code ReliabilityStrategy} and has a constructor that accepts a single {@code LoggerConfig} argument.
*
* @param loggerConfig the LoggerConfig the resulting {@code ReliabilityStrategy} is associated with
* @return a ReliabilityStrategy that helps the specified LoggerConfig to log events reliably during or after a
* configuration change
*/
public static ReliabilityStrategy getReliabilityStrategy(final LoggerConfig loggerConfig) {
- boolean waitUnconditionally = PropertiesUtil.getProperties().getBooleanProperty(
- "log4j.alwaysWaitBeforeStopOldConfig", false);
- if (waitUnconditionally) {
+
+ String strategy = PropertiesUtil.getProperties().getStringProperty("log4j.ReliabilityStrategy",
+ "AwaitCompletion");
+ if ("AwaitCompletion".equals(strategy)) {
+ return new AwaitCompletionReliabilityStrategy(loggerConfig);
+ }
+ if ("AwaitUnconditionally".equals(strategy)) {
return new AwaitUnconditionallyReliabilityStrategy(loggerConfig);
}
- return new AwaitCompletionReliabilityStrategy(loggerConfig);
+ if ("Locking".equals(strategy)) {
+ return new LockingReliabilityStrategy(loggerConfig);
+ }
+ try {
+ @SuppressWarnings("unchecked")
+ Class<? extends ReliabilityStrategy> cls = (Class<? extends ReliabilityStrategy>) Class.forName(strategy);
+ return cls.getConstructor(LoggerConfig.class).newInstance(loggerConfig);
+ } catch (Exception dynamicFailed) {
+ StatusLogger.getLogger().warn(
+ "Could not create ReliabilityStrategy for '{}', using default AwaitCompletionReliabilityStrategy");
+ return new AwaitCompletionReliabilityStrategy(loggerConfig);
+ }
}
}