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 2016/04/05 20:55:32 UTC
logging-log4j2 git commit: [LOG4J2-1354] No configuration reload is
triggered under Windows when replacing the configuration file with one that
has older last modified date. Refactor for clarity.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 23e6b06d1 -> 3bdec250c
[LOG4J2-1354] No configuration reload is triggered under Windows when
replacing the configuration file with one that has older last modified
date. Refactor for clarity.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/3bdec250
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/3bdec250
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/3bdec250
Branch: refs/heads/master
Commit: 3bdec250c71ac72af0a22ec65d5f144da755b73a
Parents: 23e6b06
Author: ggregory <gg...@apache.org>
Authored: Tue Apr 5 11:55:18 2016 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Apr 5 11:55:18 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/util/WatchManager.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/3bdec250/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
index 6da8d0f..7fc7b59 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java
@@ -86,13 +86,17 @@ public class WatchManager extends AbstractLifeCycle {
File file = entry.getKey();
FileMonitor fileMonitor = entry.getValue();
long lastModfied = file.lastModified();
- if (lastModfied > fileMonitor.lastModified) {
+ if (fileChanged(fileMonitor, lastModfied)) {
logger.info("File {} was modified", file.toString());
fileMonitor.lastModified = lastModfied;
fileMonitor.fileWatcher.fileModified(file);
}
}
}
+
+ private boolean fileChanged(FileMonitor fileMonitor, long lastModfied) {
+ return lastModfied > fileMonitor.lastModified;
+ }
}
private class FileMonitor {