diff --git a/config/source/file/watcher.go b/config/source/file/watcher.go index 3b9dc82163..5254a7a3e2 100644 --- a/config/source/file/watcher.go +++ b/config/source/file/watcher.go @@ -39,7 +39,7 @@ func (w *watcher) Next() (*source.ChangeSet, error) { return nil, source.ErrWatcherStopped } - if event.Op == fsnotify.Rename { + if event.Has(fsnotify.Rename) { // check existence of file, and add watch again _, err := os.Stat(event.Name) if err == nil || os.IsExist(err) { diff --git a/config/source/file/watcher_linux.go b/config/source/file/watcher_linux.go index d9ae7b7402..7601a0c0f3 100644 --- a/config/source/file/watcher_linux.go +++ b/config/source/file/watcher_linux.go @@ -39,7 +39,7 @@ func (w *watcher) Next() (*source.ChangeSet, error) { return nil, source.ErrWatcherStopped } - if event.Op == fsnotify.Rename { + if event.Has(fsnotify.Rename) { // check existence of file, and add watch again _, err := os.Stat(event.Name) if err == nil || os.IsExist(err) { diff --git a/go.mod b/go.mod index 3e8c71c14f..98930281c2 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/bitly/go-simplejson v0.5.0 github.com/ef-ds/deque v1.0.4 github.com/evanphx/json-patch/v5 v5.5.0 - github.com/fsnotify/fsnotify v1.4.9 + github.com/fsnotify/fsnotify v1.6.0 github.com/fsouza/go-dockerclient v1.7.3 github.com/go-acme/lego/v4 v4.4.0 github.com/go-git/go-git/v5 v5.4.2 diff --git a/go.sum b/go.sum index d9dd094360..1c1a925db2 100644 --- a/go.sum +++ b/go.sum @@ -339,6 +339,8 @@ github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsouza/go-dockerclient v1.7.3 h1:i6iMcktl688vsKUEExA6gU1UjPgIvmGtJeQ0mbuFqZo= github.com/fsouza/go-dockerclient v1.7.3/go.mod h1:8xfZB8o9SptLNJ13VoV5pMiRbZGWkU/Omu5VOu/KC9Y= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= @@ -1147,6 +1149,7 @@ golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201113234701-d7a72108b828/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=