worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow FileWatcher locations to be registered after initial start

Browse Source
This commit is contained in:
Luck 2018-07-12 17:10:07 -07:00
parent 247a40b65f
commit fa2d9357b8
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/main/java/me/lucko/luckperms/common/storage/dao/file/FileWatcher.java
View File

@ -56,6 +56,8 @@ public class FileWatcher {
// the watchservice instance // the watchservice instance
private final WatchService watchService; private final WatchService watchService;
private boolean initialised = false;
public FileWatcher(LuckPermsPlugin plugin, Path basePath) throws IOException { public FileWatcher(LuckPermsPlugin plugin, Path basePath) throws IOException {
this.watchedLocations = Collections.synchronizedMap(new HashMap<>()); this.watchedLocations = Collections.synchronizedMap(new HashMap<>());
this.basePath = basePath; this.basePath = basePath;
@ -90,6 +92,7 @@ public class FileWatcher {
e.printStackTrace(); e.printStackTrace();
} }
} }
this.initialised = true;
} }
private void tick() { private void tick() {
@ -104,10 +107,14 @@ public class FileWatcher {
expired.forEach(this.watchedLocations::remove); expired.forEach(this.watchedLocations::remove);
} }
private static boolean isFileTemporary(String fileName) {
return fileName.endsWith(".tmp") || fileName.endsWith(".swp") || fileName.endsWith(".swx") || fileName.endsWith(".swpz");
}
/** /**
* Encapsulates a "watcher" in a specific directory. * Encapsulates a "watcher" in a specific directory.
*/ */
public static final class WatchedLocation { public final class WatchedLocation {
// the parent watcher // the parent watcher
private final FileWatcher watcher; private final FileWatcher watcher;
@ -146,9 +153,20 @@ public class FileWatcher {
private boolean tick() { private boolean tick() {
if (!this.ready) { if (!this.ready) {
// await init
if (!FileWatcher.this.initialised) {
return true; return true;
} }
try {
setup();
return true;
} catch (IOException e) {
e.printStackTrace();
return false;
}
}
// remove old change entries. // remove old change entries.
long expireTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(4); long expireTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(4);
this.lastChange.values().removeIf(lastChange -> lastChange < expireTime); this.lastChange.values().removeIf(lastChange -> lastChange < expireTime);
@ -164,7 +182,7 @@ public class FileWatcher {
String fileName = context.toString(); String fileName = context.toString();
// ignore temporary changes // ignore temporary changes
if (fileName.endsWith(".tmp") || fileName.endsWith(".swp") || fileName.endsWith(".swx") || fileName.endsWith(".swpz")) { if (isFileTemporary(fileName)) {
continue; continue;
} }