bugfix when watching multiple directories

Author: fstab

tailer/fswatcher/fswatcher.go

@@ -251,6 +251,11 @@ func (t *fileTailer) watchDirs(log logrus.FieldLogger) Error {
 
 func (t *fileTailer) syncFilesInDir(dir *Dir, readall bool, log logrus.FieldLogger) Error {
 	watchedFilesAfter := make(map[string]*fileWithReader)
+	for path, file := range t.watchedFiles {
+		if filepath.Dir(path) != dir.Path() {
+			watchedFilesAfter[path] = file
+		}
+	}
 	fileInfos, Err := dir.ls()
 	if Err != nil {
 		return Err

tailer/fswatcher/fswatcher_linux.go

@@ -118,7 +118,8 @@ func (w *watcher) processEvent(t *fileTailer, fsevent fsevent, log logrus.FieldL
 	if dir == nil {
 		return NewError(NotSpecified, nil, "watch list inconsistent: received a file system event for an unknown directory")
 	}
-	log.WithField("directory", dir.path).Debugf("received event: %v", event)
+	dirLogger := log.WithField("directory", dir.path)
+	dirLogger.Debugf("received event: %v", event)
 	if event.Mask&syscall.IN_IGNORED == syscall.IN_IGNORED {
 		unwatchDirByEvent(t, event) // need to remove it from watchedDirs, because otherwise we close the removed dir on shutdown which causes an error
 		return NewErrorf(NotSpecified, nil, "%s: directory was removed while being watched", dir.path)
@@ -139,7 +140,7 @@ func (w *watcher) processEvent(t *fileTailer, fsevent fsevent, log logrus.FieldL
 			}
 			file.reader.Clear()
 		}
-		readErr := t.readNewLines(file, log)
+		readErr := t.readNewLines(file, dirLogger)
 		if readErr != nil {
 			return readErr
 		}
@@ -152,7 +153,7 @@ func (w *watcher) processEvent(t *fileTailer, fsevent fsevent, log logrus.FieldL
 		// Trying to figure out what happened from the events would be error prone.
 		// Therefore, we don't care which of the above events we received, we just update our watched files with the current
 		// state of the watched directory.
-		err := t.syncFilesInDir(dir, true, log)
+		err := t.syncFilesInDir(dir, true, dirLogger)
 		if err != nil {
 			return err
 		}

tailer/fswatcher_test.go

@@ -70,6 +70,38 @@ const tests = `
   - [expect, test line 3 logfile 1, logdir/logfile1.log]
   - [log, test line 4 logfile 2, logdir/logfile2.log]
   - [expect, test line 4 logfile 2, logdir/logfile2.log]
+
+- name: multiple directories
+  commands:
+  - [mkdir, logdir1]
+  - [mkdir, logdir2]
+  - [log, test line 1 dir 1 file 1, logdir1/logfile-1.log]
+  - [log, test line 1 dir 2 file 1, logdir2/logfile-1.log]
+  - [start file tailer, readall=true, fail_on_missing_logfile=false, logdir1/*.log, logdir2/*.log]
+  - [log, test line 1 dir 1 file 2, logdir1/logfile-2.log]
+  - [log, test line 1 dir 2 file 2, logdir2/logfile-2.log]
+  - [log, test line 2 dir 1 file 1, logdir1/logfile-1.log]
+  - [log, test line 2 dir 1 file 2, logdir1/logfile-2.log]
+  - [log, test line 2 dir 2 file 1, logdir2/logfile-1.log]
+  - [log, test line 2 dir 2 file 2, logdir2/logfile-2.log]
+  - [expect, test line 1 dir 1 file 1, logdir1/logfile-1.log]
+  - [expect, test line 1 dir 1 file 2, logdir1/logfile-2.log]
+  - [expect, test line 1 dir 2 file 1, logdir2/logfile-1.log]
+  - [expect, test line 1 dir 2 file 2, logdir2/logfile-2.log]
+  - [expect, test line 2 dir 1 file 1, logdir1/logfile-1.log]
+  - [expect, test line 2 dir 1 file 2, logdir1/logfile-2.log]
+  - [expect, test line 2 dir 2 file 1, logdir2/logfile-1.log]
+  - [expect, test line 2 dir 2 file 2, logdir2/logfile-2.log]
+  - [logrotate, logdir1/logfile-1.log, logdir1/logfile-1.log.1]
+  - [logrotate, logdir2/logfile-1.log, logdir2/logfile-1.log.1]
+  - [log, test line 3 dir 1 file 1, logdir1/logfile-1.log]
+  - [log, test line 3 dir 1 file 2, logdir1/logfile-2.log]
+  - [log, test line 3 dir 2 file 1, logdir2/logfile-1.log]
+  - [log, test line 3 dir 2 file 2, logdir2/logfile-2.log]
+  - [expect, test line 3 dir 1 file 1, logdir1/logfile-1.log]
+  - [expect, test line 3 dir 1 file 2, logdir1/logfile-2.log]
+  - [expect, test line 3 dir 2 file 1, logdir2/logfile-1.log]
+  - [expect, test line 3 dir 2 file 2, logdir2/logfile-2.log]
 `
 
 // // The following test fails on Windows in tearDown() when removing logdir.
@@ -233,6 +265,11 @@ func setUp(t *testing.T, testName string, loggerCfg loggerConfig, tailerCfg file
 	}
 	logger := logrus.New()
 	logger.Level = logrus.DebugLevel
+	logger.SetFormatter(&logrus.TextFormatter{
+		DisableColors:   true,
+		TimestampFormat: "2006-01-02 15:04:05.000",
+		FullTimestamp:   true,
+	})
 	ctx.log = logger.WithField("test", testName).WithField("params", params(ctx))
 	ctx.basedir = mkTempDir(t, ctx)
 	return ctx