check dir files in notify by base paths from include patterns

ozontech · Mar 5, 2024 · 0e46da7 · 0e46da7
1 parent 9945f6a
commit 0e46da7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -13,9 +13,9 @@ require (
 	github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137
 	github.com/alicebob/miniredis/v2 v2.30.5
 	github.com/bitly/go-simplejson v0.5.1
+	github.com/bmatcuk/doublestar/v4 v4.0.2
 	github.com/cenkalti/backoff/v4 v4.2.1
 	github.com/cespare/xxhash/v2 v2.2.0
-	github.com/bmatcuk/doublestar/v4 v4.0.2
 	github.com/euank/go-kmsg-parser v2.0.0+incompatible
 	github.com/go-redis/redis v6.15.9+incompatible
 	github.com/golang/mock v1.6.0

diff --git a/plugin/input/file/provider_test.go b/plugin/input/file/provider_test.go
@@ -83,9 +83,9 @@ func TestProvierWatcherPaths(t *testing.T) {
 			config := tt.config
 			test.NewConfig(config, map[string]int{"gomaxprocs": runtime.GOMAXPROCS(0)})
 			metrics := newMetricCollection(
-				ctl.RegisterCounter("worker", "help_test"),
-				ctl.RegisterCounter("worker", "help_test"),
-				ctl.RegisterGauge("worker", "help_test"),
+				ctl.RegisterCounter("worker1", "help_test"),
+				ctl.RegisterCounter("worker2", "help_test"),
+				ctl.RegisterGauge("worker3", "help_test"),
 			)
 			jp := NewJobProvider(config, metrics, &zap.SugaredLogger{})
 

diff --git a/plugin/input/file/watcher.go b/plugin/input/file/watcher.go
@@ -152,10 +152,12 @@ func (w *watcher) notify(e notify.Event, path string) {
 
 	if stat.IsDir() {
 		dirFilename := filename
+	check_dir:
 		for {
 			for _, path := range w.basePaths {
 				if path == dirFilename {
 					w.tryAddPath(filename)
+					break check_dir
 				}
 			}
 			if dirFilename == w.commonPath {
@@ -166,6 +168,20 @@ func (w *watcher) notify(e notify.Event, path string) {
 		return
 	}
 
+	dirFilename := filepath.Dir(filename)
+check_file:
+	for {
+		for _, path := range w.basePaths {
+			if path == dirFilename {
+				break check_file
+			}
+		}
+		if dirFilename == w.commonPath {
+			return
+		}
+		dirFilename = filepath.Dir(dirFilename)
+	}
+
 	w.logger.Infof("%s %s", e, path)
 
 	for _, pattern := range w.paths.Include {

diff --git a/plugin/input/file/watcher_test.go b/plugin/input/file/watcher_test.go
@@ -88,6 +88,7 @@ func TestWatcher(t *testing.T) {
 	}
 }
 
+// nolint:gocritic
 func TestWatcherPaths(t *testing.T) {
 	dir := t.TempDir()
 	shouldCreate := atomic.Int64{}