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/04/16 01:03:29 UTC
logging-log4j2 git commit: Use the name 'intervalSeconds' instead of
'interval' in internal names to make it obvious what the scale is.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 23dee1b89 -> 4cce32b3d
Use the name 'intervalSeconds' instead of 'interval' in internal names
to make it obvious what the scale is.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4cce32b3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4cce32b3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4cce32b3
Branch: refs/heads/master
Commit: 4cce32b3d0eea47a17fff9ae3843ded688fe7802
Parents: 23dee1b
Author: Gary Gregory <ga...@gmail.com>
Authored: Wed Apr 15 16:03:22 2015 -0700
Committer: Gary Gregory <ga...@gmail.com>
Committed: Wed Apr 15 16:03:22 2015 -0700
----------------------------------------------------------------------
.../log4j/core/config/FileConfigurationMonitor.java | 12 ++++++------
.../log4j/core/config/json/JsonConfiguration.java | 6 +++---
.../logging/log4j/core/config/xml/XmlConfiguration.java | 6 +++---
3 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4cce32b3/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 b3f30da..38f64cf 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
@@ -40,7 +40,7 @@ public class FileConfigurationMonitor implements ConfigurationMonitor {
private final List<ConfigurationListener> listeners;
- private final int interval;
+ private final int intervalSeconds;
private long nextCheck;
@@ -55,17 +55,17 @@ public class FileConfigurationMonitor implements ConfigurationMonitor {
* @param reconfigurable The Configuration that can be reconfigured.
* @param file The File to monitor.
* @param listeners The List of ConfigurationListeners to notify upon a change.
- * @param interval The monitor interval in seconds. The minimum interval is 5 seconds.
+ * @param intervalSeconds The monitor interval in seconds. The minimum interval is 5 seconds.
*/
public FileConfigurationMonitor(final Reconfigurable reconfigurable, final File file,
final List<ConfigurationListener> listeners,
- final int interval) {
+ final int intervalSeconds) {
this.reconfigurable = reconfigurable;
this.file = file;
this.lastModified = file.lastModified();
this.listeners = listeners;
- this.interval = (interval < MIN_INTERVAL ? MIN_INTERVAL : interval) * MILLIS_PER_SECOND;
- this.nextCheck = System.currentTimeMillis() + interval;
+ this.intervalSeconds = (intervalSeconds < MIN_INTERVAL ? MIN_INTERVAL : intervalSeconds) * MILLIS_PER_SECOND;
+ this.nextCheck = System.currentTimeMillis() + intervalSeconds;
}
/**
@@ -77,7 +77,7 @@ public class FileConfigurationMonitor implements ConfigurationMonitor {
if (((counter.incrementAndGet() & MASK) == 0) && (current >= nextCheck)) {
LOCK.lock();
try {
- nextCheck = current + interval;
+ nextCheck = current + intervalSeconds;
if (file.lastModified() > lastModified) {
lastModified = file.lastModified();
for (final ConfigurationListener listener : listeners) {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4cce32b3/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
index 6b5dbfd..c9a8726 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JsonConfiguration.java
@@ -88,9 +88,9 @@ public class JsonConfiguration extends AbstractConfiguration implements Reconfig
} else if ("name".equalsIgnoreCase(key)) {
setName(value);
} else if ("monitorInterval".equalsIgnoreCase(key)) {
- final int interval = Integer.parseInt(value);
- if (interval > 0 && configFile != null) {
- monitor = new FileConfigurationMonitor(this, configFile, listeners, interval);
+ final int intervalSeconds = Integer.parseInt(value);
+ if (intervalSeconds > 0 && configFile != null) {
+ monitor = new FileConfigurationMonitor(this, configFile, listeners, intervalSeconds);
}
} else if ("advertiser".equalsIgnoreCase(key)) {
createAdvertiser(value, configSource, buffer, "application/json");
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4cce32b3/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
index f671eac..2425508 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/xml/XmlConfiguration.java
@@ -162,9 +162,9 @@ public class XmlConfiguration extends AbstractConfiguration implements Reconfigu
} else if ("schema".equalsIgnoreCase(key)) {
schemaResource = value;
} else if ("monitorInterval".equalsIgnoreCase(key)) {
- final int interval = Integer.parseInt(value);
- if (interval > 0 && configFile != null) {
- monitor = new FileConfigurationMonitor(this, configFile, listeners, interval);
+ final int intervalSeconds = Integer.parseInt(value);
+ if (intervalSeconds > 0 && configFile != null) {
+ monitor = new FileConfigurationMonitor(this, configFile, listeners, intervalSeconds);
}
} else if ("advertiser".equalsIgnoreCase(key)) {
createAdvertiser(value, configSource, buffer, "text/xml");