378f688a6a
* add config watcher to the config package * add logging to watcher * add test and refactor to add WatcherEvent. * add all API calls and fix a bug with recreated files * add tests for watcher * remove the unnecessary use of context * Add debug log and a test for file rename * use inode to detect if the file is recreated/replaced and only listen to create events. * tidy ups (#1535) * tidy ups * Add tests for inode reconcile * fix linux vs windows syscall * fix linux vs windows syscall * fix windows compile error * increase timeout * use ctime ID * remove remove/creation test as it's a use case that fail in linux * fix linux/windows to use Ino/CreationTime * fix the watcher to only overwrite current file id * fix linter error * fix remove/create test * set reconcile loop to 200 Milliseconds * fix watcher to not trigger event on remove, add more tests * on a remove event try to add the file back to the watcher and trigger the handler if success * fix race condition * fix flaky test * fix race conditions * set level to info * fix when file is removed and get an event for it after * fix to trigger handler when we get a remove but re-add fail * fix error message * add tests for directory watch and fixes * detect if a file is a symlink and return an error on Add * rename Watcher to FileWatcher and remove symlink deref * add fsnotify@v1.5.1 * fix go mod * fix flaky test * Apply suggestions from code review Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com> * fix a possible stack overflow * do not reset timer on errors, rename OS specific files * start the watcher when creating it * fix data race in tests * rename New func * do not call handler when a remove event happen * events trigger on write and rename * fix watcher tests * make handler async * remove recursive call * do not produce events for sub directories * trim "/" at the end of a directory when adding * add missing test * fix logging * add todo * fix failing test * fix flaking tests * fix flaky test * add logs * fix log text * increase timeout * reconcile when remove * check reconcile when removed * fix reconcile move test * fix logging * delete invalid file * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * fix review comments * fix is watched to properly catch a remove * change test timeout * fix test and rename id * fix test to create files with different mod time. * fix deadlock when stopping watcher * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * fix a deadlock when calling stop while emitting event is blocked * make sure to close the event channel after the event loop is done * add go doc * back date file instead of sleeping * Apply suggestions from code review Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> * check error Co-authored-by: Ashwin Venkatesh <ashwin@hashicorp.com> Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com>
250 lines
6.6 KiB
Go
250 lines
6.6 KiB
Go
package config
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/fsnotify/fsnotify"
|
|
"github.com/hashicorp/go-hclog"
|
|
)
|
|
|
|
const timeoutDuration = 200 * time.Millisecond
|
|
|
|
type FileWatcher struct {
|
|
watcher *fsnotify.Watcher
|
|
configFiles map[string]*watchedFile
|
|
logger hclog.Logger
|
|
reconcileTimeout time.Duration
|
|
cancel context.CancelFunc
|
|
done chan interface{}
|
|
stopOnce sync.Once
|
|
|
|
//EventsCh Channel where an event will be emitted when a file change is detected
|
|
// a call to Start is needed before any event is emitted
|
|
// after a Call to Stop succeed, the channel will be closed
|
|
EventsCh chan *FileWatcherEvent
|
|
}
|
|
|
|
type watchedFile struct {
|
|
modTime time.Time
|
|
}
|
|
|
|
type FileWatcherEvent struct {
|
|
Filename string
|
|
}
|
|
|
|
//NewFileWatcher create a file watcher that will watch all the files/folders from configFiles
|
|
// if success a FileWatcher will be returned and a nil error
|
|
// otherwise an error and a nil FileWatcher are returned
|
|
func NewFileWatcher(configFiles []string, logger hclog.Logger) (*FileWatcher, error) {
|
|
ws, err := fsnotify.NewWatcher()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
w := &FileWatcher{
|
|
watcher: ws,
|
|
logger: logger.Named("file-watcher"),
|
|
configFiles: make(map[string]*watchedFile),
|
|
EventsCh: make(chan *FileWatcherEvent),
|
|
reconcileTimeout: timeoutDuration,
|
|
done: make(chan interface{}),
|
|
stopOnce: sync.Once{},
|
|
}
|
|
for _, f := range configFiles {
|
|
err = w.add(f)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("error adding file %q: %w", f, err)
|
|
}
|
|
}
|
|
|
|
return w, nil
|
|
}
|
|
|
|
// Start start a file watcher, with a copy of the passed context.
|
|
// calling Start multiple times is a noop
|
|
func (w *FileWatcher) Start(ctx context.Context) {
|
|
if w.cancel == nil {
|
|
cancelCtx, cancel := context.WithCancel(ctx)
|
|
w.cancel = cancel
|
|
go w.watch(cancelCtx)
|
|
}
|
|
}
|
|
|
|
// Stop the file watcher
|
|
// calling Stop multiple times is a noop, Stop must be called after a Start
|
|
func (w *FileWatcher) Stop() error {
|
|
var err error
|
|
w.stopOnce.Do(func() {
|
|
w.cancel()
|
|
<-w.done
|
|
close(w.EventsCh)
|
|
err = w.watcher.Close()
|
|
})
|
|
return err
|
|
}
|
|
|
|
func (w *FileWatcher) add(filename string) error {
|
|
if isSymLink(filename) {
|
|
return fmt.Errorf("symbolic links are not supported %s", filename)
|
|
}
|
|
filename = filepath.Clean(filename)
|
|
w.logger.Trace("adding file", "file", filename)
|
|
if err := w.watcher.Add(filename); err != nil {
|
|
return err
|
|
}
|
|
modTime, err := w.getFileModifiedTime(filename)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
w.configFiles[filename] = &watchedFile{modTime: modTime}
|
|
return nil
|
|
}
|
|
|
|
func isSymLink(filename string) bool {
|
|
fi, err := os.Lstat(filename)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
if fi.Mode()&os.ModeSymlink != 0 {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func (w *FileWatcher) watch(ctx context.Context) {
|
|
ticker := time.NewTicker(w.reconcileTimeout)
|
|
defer ticker.Stop()
|
|
defer close(w.done)
|
|
|
|
for {
|
|
select {
|
|
case event, ok := <-w.watcher.Events:
|
|
if !ok {
|
|
w.logger.Error("watcher event channel is closed")
|
|
return
|
|
}
|
|
w.logger.Trace("received watcher event", "event", event)
|
|
if err := w.handleEvent(ctx, event); err != nil {
|
|
w.logger.Error("error handling watcher event", "error", err, "event", event)
|
|
}
|
|
case _, ok := <-w.watcher.Errors:
|
|
if !ok {
|
|
w.logger.Error("watcher error channel is closed")
|
|
return
|
|
}
|
|
case <-ticker.C:
|
|
w.reconcile(ctx)
|
|
case <-ctx.Done():
|
|
return
|
|
}
|
|
}
|
|
}
|
|
|
|
func (w *FileWatcher) handleEvent(ctx context.Context, event fsnotify.Event) error {
|
|
w.logger.Trace("event received ", "filename", event.Name, "OP", event.Op)
|
|
// we only want Create and Remove events to avoid triggering a reload on file modification
|
|
if !isCreateEvent(event) && !isRemoveEvent(event) && !isWriteEvent(event) && !isRenameEvent(event) {
|
|
return nil
|
|
}
|
|
filename := filepath.Clean(event.Name)
|
|
configFile, basename, ok := w.isWatched(filename)
|
|
if !ok {
|
|
return fmt.Errorf("file %s is not watched", event.Name)
|
|
}
|
|
|
|
// we only want to update mod time and re-add if the event is on the watched file itself
|
|
if filename == basename {
|
|
if isRemoveEvent(event) {
|
|
// If the file was removed, try to reconcile and see if anything changed.
|
|
w.logger.Trace("attempt a reconcile ", "filename", event.Name, "OP", event.Op)
|
|
configFile.modTime = time.Time{}
|
|
w.reconcile(ctx)
|
|
}
|
|
}
|
|
if isCreateEvent(event) || isWriteEvent(event) || isRenameEvent(event) {
|
|
w.logger.Trace("call the handler", "filename", event.Name, "OP", event.Op)
|
|
select {
|
|
case w.EventsCh <- &FileWatcherEvent{Filename: filename}:
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (w *FileWatcher) isWatched(filename string) (*watchedFile, string, bool) {
|
|
path := filename
|
|
configFile, ok := w.configFiles[path]
|
|
if ok {
|
|
return configFile, path, true
|
|
}
|
|
|
|
stat, err := os.Lstat(filename)
|
|
|
|
// if the error is a not exist still try to find if the event for a configured file
|
|
if os.IsNotExist(err) || (!stat.IsDir() && stat.Mode()&os.ModeSymlink == 0) {
|
|
w.logger.Trace("not a dir and not a symlink to a dir")
|
|
// try to see if the watched path is the parent dir
|
|
newPath := filepath.Dir(path)
|
|
w.logger.Trace("get dir", "dir", newPath)
|
|
configFile, ok = w.configFiles[newPath]
|
|
}
|
|
return configFile, path, ok
|
|
}
|
|
|
|
func (w *FileWatcher) reconcile(ctx context.Context) {
|
|
for filename, configFile := range w.configFiles {
|
|
w.logger.Trace("reconciling", "filename", filename)
|
|
newModTime, err := w.getFileModifiedTime(filename)
|
|
if err != nil {
|
|
w.logger.Error("failed to get file modTime", "file", filename, "err", err)
|
|
continue
|
|
}
|
|
|
|
err = w.watcher.Add(filename)
|
|
if err != nil {
|
|
w.logger.Error("failed to add file to watcher", "file", filename, "err", err)
|
|
continue
|
|
}
|
|
if !configFile.modTime.Equal(newModTime) {
|
|
w.logger.Trace("call the handler", "filename", filename, "old modTime", configFile.modTime, "new modTime", newModTime)
|
|
w.configFiles[filename].modTime = newModTime
|
|
select {
|
|
case w.EventsCh <- &FileWatcherEvent{Filename: filename}:
|
|
case <-ctx.Done():
|
|
return
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func isCreateEvent(event fsnotify.Event) bool {
|
|
return event.Op&fsnotify.Create == fsnotify.Create
|
|
}
|
|
|
|
func isRemoveEvent(event fsnotify.Event) bool {
|
|
return event.Op&fsnotify.Remove == fsnotify.Remove
|
|
}
|
|
|
|
func isWriteEvent(event fsnotify.Event) bool {
|
|
return event.Op&fsnotify.Write == fsnotify.Write
|
|
}
|
|
|
|
func isRenameEvent(event fsnotify.Event) bool {
|
|
return event.Op&fsnotify.Rename == fsnotify.Rename
|
|
}
|
|
|
|
func (w *FileWatcher) getFileModifiedTime(filename string) (time.Time, error) {
|
|
fileInfo, err := os.Stat(filename)
|
|
if err != nil {
|
|
return time.Time{}, err
|
|
}
|
|
|
|
return fileInfo.ModTime(), err
|
|
}
|