fixed inotify descriptor was closed in other goroutine while reading …

…from it that caused a deadlock
illarion · Sep 16, 2024 · 56eb3c2 · 56eb3c2
1 parent 2d790be
commit 56eb3c2
Show file tree

Hide file tree

Showing 2 changed files with 191 additions and 147 deletions.
diff --git a/dirwatcher.go b/dirwatcher.go
@@ -88,6 +88,13 @@ func NewDirWatcher(ctx context.Context, fileMask uint32, root string) (*DirWatch
 				return
 			}
 
+			select {
+			case <-ctx.Done():
+				close(events)
+				return
+			default:
+			}
+
 			for _, event := range raw {
 
 				// Skip ignored events queued from removed watchers
@@ -170,7 +177,6 @@ func NewDirWatcher(ctx context.Context, fileMask uint32, root string) (*DirWatch
 						return
 					}
 				}
-				return
 			case event, ok := <-events:
 				if !ok {
 					select {
@@ -197,8 +203,8 @@ func NewDirWatcher(ctx context.Context, fileMask uint32, root string) (*DirWatch
 	}()
 
 	go func() {
-		<-i.Done()
 		wg.Wait()
+		<-i.Done()
 		close(dw.done)
 	}()