improve windows file tailer shutdown

fstab · Jun 6, 2019 · 49fe484 · 49fe484
1 parent 41c13c3
commit 49fe484
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/tailer/fswatcher/fseventProducerLoop_windows.go b/tailer/fswatcher/fseventProducerLoop_windows.go
@@ -44,9 +44,19 @@ func runWinWatcherLoop(w *winfsnotify.Watcher) *winwatcherloop {
 		for {
 			select {
 			case event := <-w.Event:
-				events <- event
+				select {
+				case events <- event:
+				case <-done:
+					w.Close()
+					return
+				}
 			case err := <-w.Error:
-				errors <- NewError(NotSpecified, err, "")
+				select {
+				case errors <- NewError(NotSpecified, err, ""):
+				case <-done:
+					w.Close()
+					return
+				}
 			case <-done:
 				w.Close()
 				return

diff --git a/tailer/fswatcher_test.go b/tailer/fswatcher_test.go
@@ -333,7 +333,7 @@ func assertGoroutinesTerminated(t *testing.T, ctx *context, nGoroutinesBefore in
 	nHangingGoroutines := runtime.NumGoroutine() - nGoroutinesBefore
 	if nHangingGoroutines > 0 {
 		pprof.Lookup("goroutine").WriteTo(os.Stdout, 1)
-		fatalf(t, ctx, "%v goroutines did not shut down properly.", nHangingGoroutines)
+		fatalf(t, ctx, "%v goroutine(s) did not shut down properly.", nHangingGoroutines)
 	}
 }