Add support for symlinks in FileWatcher
This commit allows using symlinks for SSL certificate hot reloading. See gh-43586
This commit is contained in:
parent
0035569882
commit
26ca3790b2
|
|
@ -86,7 +86,7 @@ class FileWatcher implements Closeable {
|
|||
this.thread = new WatcherThread();
|
||||
this.thread.start();
|
||||
}
|
||||
this.thread.register(new Registration(paths, action));
|
||||
this.thread.register(new Registration(resolveSymlinks(paths), action));
|
||||
}
|
||||
catch (IOException ex) {
|
||||
throw new UncheckedIOException("Failed to register paths for watching: " + paths, ex);
|
||||
|
|
@ -94,6 +94,17 @@ class FileWatcher implements Closeable {
|
|||
}
|
||||
}
|
||||
|
||||
private Set<Path> resolveSymlinks(Set<Path> paths) throws IOException {
|
||||
Set<Path> result = new HashSet<>();
|
||||
for (Path path : paths) {
|
||||
result.add(path);
|
||||
if (Files.isSymbolicLink(path)) {
|
||||
result.add(Files.readSymbolicLink(path));
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void close() throws IOException {
|
||||
synchronized (this.lock) {
|
||||
|
|
|
|||
|
|
@ -94,6 +94,18 @@ class FileWatcherTests {
|
|||
callback.expectChanges();
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldFollowSymlink(@TempDir Path tempDir) throws Exception {
|
||||
Path realFile = tempDir.resolve("realFile.txt");
|
||||
Path symLink = tempDir.resolve("symlink.txt");
|
||||
Files.createFile(realFile);
|
||||
Files.createSymbolicLink(symLink, realFile);
|
||||
WaitingCallback callback = new WaitingCallback();
|
||||
this.fileWatcher.watch(Set.of(symLink), callback);
|
||||
Files.writeString(realFile, "Some content");
|
||||
callback.expectChanges();
|
||||
}
|
||||
|
||||
@Test
|
||||
void shouldIgnoreNotWatchedFiles(@TempDir Path tempDir) throws Exception {
|
||||
Path watchedFile = tempDir.resolve("watched.txt");
|
||||
|
|
|
|||
Loading…
Reference in New Issue