Updated for review comments

Signed-off-by: MichaelMorris <[email protected]>

Author: MichaelMorrisEst

log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java

@@ -331,7 +331,7 @@ public void start() {
                         getConfigurationSource(),
                         uris,
                         watchManager.getIntervalSeconds());
-                watchManager.addMonitorUris(configurationSource.getSource(), uris);
+                watchMonitorUris();
             } else {
                 LOGGER.info(
                         "Start watching for changes to {} every {} seconds",
@@ -358,6 +358,17 @@ public void start() {
         LOGGER.info("Configuration {} started.", this);
     }
 
+    private void watchMonitorUris() {
+        if (this instanceof Reconfigurable) {
+            uris.stream().forEach(uri -> {
+                Source source = new Source(uri);
+                final ConfigurationFileWatcher watcher = new ConfigurationFileWatcher(
+                        this, (Reconfigurable) this, listeners, source.getFile().lastModified());
+                watchManager.watch(source, watcher);
+            });
+        }
+    }
+
     private boolean hasAsyncLoggers() {
         if (root instanceof AsyncLoggerConfig) {
             return true;

log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationFileWatcher.java

@@ -17,10 +17,7 @@
 package org.apache.logging.log4j.core.config;
 
 import java.io.File;
-import java.net.URI;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import org.apache.logging.log4j.core.util.AbstractWatcher;
 import org.apache.logging.log4j.core.util.FileWatcher;
 import org.apache.logging.log4j.core.util.Source;
@@ -31,57 +28,38 @@
  */
 public class ConfigurationFileWatcher extends AbstractWatcher implements FileWatcher {
 
-    private Map<File, Long> monitoredFiles = new HashMap<>();
+    private File file;
+    private long lastModifiedMillis;
 
     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() {
-        Long lastModifiedMillis = 0L;
-        for (final File monitoredFile : monitoredFiles.keySet()) {
-            if (monitoredFile.lastModified() > lastModifiedMillis) {
-                lastModifiedMillis = monitoredFile.lastModified();
-            }
-        }
-        return lastModifiedMillis;
+        return file != null ? file.lastModified() : 0;
     }
 
     @Override
     public void fileModified(final File file) {
-        monitoredFiles.entrySet().stream()
-                .forEach(monitoredFile ->
-                        monitoredFile.setValue(monitoredFile.getKey().lastModified()));
+        lastModifiedMillis = file.lastModified();
     }
 
     @Override
     public void watching(final Source source) {
-        File file = source.getFile();
-        monitoredFiles.put(file, file.lastModified());
+        file = source.getFile();
+        lastModifiedMillis = file.lastModified();
         super.watching(source);
     }
 
-    /**
-     * Add the given URIs to be watched.
-     *
-     * @param monitorUris URIs to also watch
-     */
-    public void addMonitorUris(final List<URI> monitorUris) {
-        monitorUris.forEach(uri -> {
-            File additionalFile = new Source(uri).getFile();
-            monitoredFiles.put(additionalFile, additionalFile.lastModified());
-        });
-    }
-
     @Override
     public boolean isModified() {
-        return monitoredFiles.entrySet().stream()
-                .anyMatch(file -> file.getValue() != file.getKey().lastModified());
+        return lastModifiedMillis != file.lastModified();
     }
 
     @Override

log4j-core/src/main/java/org/apache/logging/log4j/core/config/ConfigurationSource.java

@@ -382,8 +382,4 @@ public String toString() {
             return null;
         }
     }
-
-    Source getSource() {
-        return this.source;
-    }
 }

log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java

@@ -20,7 +20,6 @@
 import aQute.bnd.annotation.Resolution;
 import aQute.bnd.annotation.spi.ServiceConsumer;
 import java.io.File;
-import java.net.URI;
 import java.time.Instant;
 import java.util.Date;
 import java.util.HashMap;
@@ -371,17 +370,4 @@ public void watchFile(final File file, final FileWatcher fileWatcher) {
         final Source source = new Source(file);
         watch(source, watcher);
     }
-
-    /**
-     * Add the given URIs to be monitored for the given source.
-     *
-     * @param source the source being watched.
-     * @param monitorUris the URIs to also watch
-     */
-    public void addMonitorUris(final Source source, final List<URI> monitorUris) {
-        ConfigurationMonitor monitor = watchers.get(source);
-        if (monitor != null && monitor.getWatcher() instanceof ConfigurationFileWatcher) {
-            ((ConfigurationFileWatcher) monitor.getWatcher()).addMonitorUris(monitorUris);
-        }
-    }
 }