MichaelMorrisEst commented on code in PR #3501:
URL: https://github.com/apache/logging-log4j2/pull/3501#discussion_r2054288736
##########
log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFileWatcher.java:
##########
@@ -28,38 +31,57 @@
*/
public class ConfigurationFileWatcher extends AbstractWatcher implements
FileWatcher {
- private File file;
- private long lastModifiedMillis;
+ private Map<File, Long> monitoredFiles = new HashMap<>();
public ConfigurationFileWatcher(
final Configuration configuration,
final Reconfigurable reconfigurable,
final List<ConfigurationListener> configurationListeners,
long lastModifiedMillis) {
super(configuration, reconfigurable, configurationListeners);
- this.lastModifiedMillis = lastModifiedMillis;
}
@Override
public long getLastModified() {
- return file != null ? file.lastModified() : 0;
+ Long lastModifiedMillis = 0L;
+ for (final File monitoredFile : monitoredFiles.keySet()) {
+ if (monitoredFile.lastModified() > lastModifiedMillis) {
+ lastModifiedMillis = monitoredFile.lastModified();
+ }
+ }
+ return lastModifiedMillis;
Review Comment:
Not applicable any more with changes from other comments
##########
log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFileWatcher.java:
##########
@@ -28,38 +31,57 @@
*/
public class ConfigurationFileWatcher extends AbstractWatcher implements
FileWatcher {
- private File file;
- private long lastModifiedMillis;
+ private Map<File, Long> monitoredFiles = new HashMap<>();
public ConfigurationFileWatcher(
final Configuration configuration,
final Reconfigurable reconfigurable,
final List<ConfigurationListener> configurationListeners,
long lastModifiedMillis) {
super(configuration, reconfigurable, configurationListeners);
- this.lastModifiedMillis = lastModifiedMillis;
}
@Override
public long getLastModified() {
- return file != null ? file.lastModified() : 0;
+ Long lastModifiedMillis = 0L;
+ for (final File monitoredFile : monitoredFiles.keySet()) {
+ if (monitoredFile.lastModified() > lastModifiedMillis) {
+ lastModifiedMillis = monitoredFile.lastModified();
+ }
+ }
+ return lastModifiedMillis;
}
@Override
public void fileModified(final File file) {
- lastModifiedMillis = file.lastModified();
+ monitoredFiles.entrySet().stream()
+ .forEach(monitoredFile ->
+
monitoredFile.setValue(monitoredFile.getKey().lastModified()));
Review Comment:
Not applicable any more with changes from other comments
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscr...@logging.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
