SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure no errros if not monitoring local files

Browse Source 
Fixes gh-239
This commit is contained in:
Dave Syer
2015-09-29 11:43:04 +01:00
parent 25dfa37612
commit 7ca8d76e90
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-config-monitor/src/main/java/org/springframework/cloud/config/monitor/FileMonitorConfiguration.java
View File

@@ -134,6 +134,7 @@ public class FileMonitorConfiguration implements SmartLifecycle, ResourceLoaderA
if (!this.running) {
this.directory = getFileRepo();
if (this.directory != null && !this.directory.isEmpty()) {
log.info("Monitoring for local config changes: " + this.directory);
try {
this.watcher = FileSystems.getDefault().newWatchService();
for (Path path : this.directory) {
@@ -143,6 +144,9 @@ public class FileMonitorConfiguration implements SmartLifecycle, ResourceLoaderA
catch (IOException e) {
}
}
else {
log.info("Not monitoring for local config changes");
}
this.running = true;
}
}
@@ -150,11 +154,14 @@ public class FileMonitorConfiguration implements SmartLifecycle, ResourceLoaderA
@Override
public synchronized void stop() {
if (this.running) {
try {
this.watcher.close();
}
catch (IOException e) {
log.error("Failed to close watcher for " + this.directory.toString(), e);
if (this.watcher != null) {
try {
this.watcher.close();
}
catch (IOException e) {
log.error("Failed to close watcher for " + this.directory.toString(),
e);
}
}
this.running = false;
}
@@ -205,8 +212,11 @@ public class FileMonitorConfiguration implements SmartLifecycle, ResourceLoaderA
}
private Set<File> filesFromEvents() {
WatchKey key = this.watcher.poll();
Set<File> files = new LinkedHashSet<File>();
if (this.watcher == null) {
return files;
}
WatchKey key = this.watcher.poll();
while (key != null) {
for (WatchEvent<?> event : key.pollEvents()) {
if (event.kind() == StandardWatchEventKinds.ENTRY_CREATE