Fix tailing multiple log files

ruudk · ruudk · commit 8b9f6cd7b521 · 2021-12-31T10:13:12.000+01:00
Because the goroutine is started within a for loop we need to pass the applog variable to the closure. Otherwise, it references the last one in the loop. Explaination: https://riptutorial.com/go/example/3897/using-closures-with-goroutines-in-a-loop Fixes: - https://github.com/symfony/cli/issues/488
diff --git a/local/logs/tailer.go b/local/logs/tailer.go
@@ -120,7 +120,7 @@ func (tailer *Tailer) Watch(pidFile *pid.PidFile) error {
 			if err := inotify.Watch(dir, watcherChan, inotify.Create); err != nil {
 				return errors.Wrap(err, "unable to watch the applog directory")
 			}
-			go func() {
+			go func(applog string) {
 				for {
 					e := <-watcherChan
 					if e.Path() != applog {
@@ -141,7 +141,7 @@ func (tailer *Tailer) Watch(pidFile *pid.PidFile) error {
 						}
 					}()
 				}
-			}()
+			}(applog)
 			watcherChan <- logFileEvent(applog)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ func (tailer Tailer) Watch(pidFile pid.PidFile) error {`
`120`	`120`	`if err := inotify.Watch(dir, watcherChan, inotify.Create); err != nil {`
`121`	`121`	`return errors.Wrap(err, "unable to watch the applog directory")`
`122`	`122`	`}`
`123`		`- go func() {`
	`123`	`+ go func(applog string) {`
`124`	`124`	`for {`
`125`	`125`	`e := <-watcherChan`
`126`	`126`	`if e.Path() != applog {`
`@@ -141,7 +141,7 @@ func (tailer Tailer) Watch(pidFile pid.PidFile) error {`
`141`	`141`	`}`
`142`	`142`	`}()`
`143`	`143`	`}`
`144`		`- }()`
	`144`	`+ }(applog)`
`145`	`145`	`watcherChan <- logFileEvent(applog)`
`146`	`146`	`}`
`147`	`147`	`}`