Fix fsnotify deadlock on linux

Matt Rogers · simo5 · commit 4ee336e57321 · 2017-10-06T10:10:31.000-04:00
The watcher.Remove() call added per 020a35e as a fix for Windows behavior causes a deadlock on linux during a file rename and replace. Remove this call since we do not care about running on Windows.
diff --git a/watcher.go b/watcher.go
@@ -51,7 +51,6 @@ func WatchForUpdates(filename string, done <-chan bool, action func()) {
 				// can't be opened.
 				if event.Op&(fsnotify.Remove|fsnotify.Rename|fsnotify.Chmod) != 0 {
 					log.Printf("watching interrupted on event: %s", event)
-					watcher.Remove(filename)
 					WaitForReplacement(filename, event.Op, watcher)
 				}
 				log.Printf("reloading after event: %s", event)

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ func WatchForUpdates(filename string, done <-chan bool, action func()) {`
`51`	`51`	`// can't be opened.`
`52`	`52`	`if event.Op&(fsnotify.Remove\|fsnotify.Rename\|fsnotify.Chmod) != 0 {`
`53`	`53`	`log.Printf("watching interrupted on event: %s", event)`
`54`		`- watcher.Remove(filename)`
`55`	`54`	`WaitForReplacement(filename, event.Op, watcher)`
`56`	`55`	`}`
`57`	`56`	`log.Printf("reloading after event: %s", event)`