- add Files.isReadable() check

- log the watching file path
Toparvion · May 31, 2020 · 0bc13fc · 0bc13fc
1 parent bae63bf
commit 0bc13fc
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/src/main/java/tech/toparvion/analog/service/choice/ChoicesAutoReloadConfiguration.java b/src/main/java/tech/toparvion/analog/service/choice/ChoicesAutoReloadConfiguration.java
@@ -17,8 +17,8 @@
 import java.util.concurrent.Executor;
 
 import static com.google.common.base.Strings.isNullOrEmpty;
-import static java.nio.file.Files.exists;
 import static java.nio.file.Files.isDirectory;
+import static java.nio.file.Files.isReadable;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
 import static java.util.Objects.requireNonNullElse;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
@@ -37,7 +37,7 @@ class ChoicesAutoReloadConfiguration {
 
  @Bean(CHOICES_HOT_RELOAD_EXECUTOR)
  Executor choicesHotReloadExecutor() {
- return newSingleThreadExecutor(new CustomizableThreadFactory("hot-reload"));
+ return newSingleThreadExecutor(new CustomizableThreadFactory("hot-reload-"));
  }
 
  @Bean
@@ -52,8 +52,8 @@ FileWatcherProvider fileWatcherProvider(ChoicesAutoReloadProperties choiceProper
  try {
  Path choicesPropertiesPath = Paths.get(choicesPropertiesLocation); //check exception
 
- if (!exists(choicesPropertiesPath)) {
- log.warn("File '{}' does not exist", choicesPropertiesLocation);
+ if (!isReadable(choicesPropertiesPath)) {
+ log.warn("File '{}' does not exist or there is no read access to this file", choicesPropertiesLocation);
  return null;
  }
  if (isDirectory(choicesPropertiesPath)) {
@@ -74,22 +74,26 @@ static class FileWatcherProvider {
 
  FileWatcherProvider(Path choicesPropertiesPath) throws IOException {
  this.choicesPropertiesPath = choicesPropertiesPath;
- this.watchDir = getParent(choicesPropertiesPath);
+ this.watchDir = fetchParent(choicesPropertiesPath);
  this.watchService = FileSystems.getDefault().newWatchService();
 
  watchDir.register(watchService, ENTRY_MODIFY);
  }
 
+ public WatchService getWatchService() {
+ return watchService;
+ }
+
+ public Path getChoicesPropertiesPath() {
+ return choicesPropertiesPath;
+ }
+
  public boolean isChoicesPropertiesFileEvent(Path eventPath) {
  Path eventResolvedPath = watchDir.resolve(eventPath);
  return Objects.equals(choicesPropertiesPath, eventResolvedPath);
  }
 
- public WatchService getWatchService() {
- return watchService;
- }
-
- private Path getParent(Path path) {
+ private Path fetchParent(Path path) {
  return requireNonNullElse(path.getParent(), path);
  }
  }

diff --git a/src/main/java/tech/toparvion/analog/service/choice/ChoicesPropertiesChangesListener.java b/src/main/java/tech/toparvion/analog/service/choice/ChoicesPropertiesChangesListener.java
@@ -44,7 +44,7 @@ public void watchFile() {
  return;
  }
  try {
- log.info("Start watching for the choices properties file");
+ log.info("Start watching for the choices properties file: '{}'", fileWatcherProvider.getChoicesPropertiesPath().toAbsolutePath());
  WatchService watchService = fileWatcherProvider.getWatchService();
  WatchKey key;
  while ((key = watchService.take()) != null) {