meutel/oauth2_proxy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove file watch upon interruption

Browse Source 
TestValidatorOverwriteEmailListViaRenameAndReplace was deadlocking on
Windows because, on Windows, fsnotify.Watcher will continue to watch a
renamed file using its new name. On other systems, it appears the watch on
a file is removed after a rename.

The fix is to explicitly remove the watch to ensure the watch is resumed
under the original name.
This commit is contained in:
Mike Bland 2015-05-14 07:57:30 -04:00
parent 5f2df7167a
commit 020a35e85f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
watcher.go
View File

@ -12,17 +12,18 @@ import (
"gopkg.in/fsnotify.v1" "gopkg.in/fsnotify.v1"
) )
func WaitForReplacement(event fsnotify.Event, watcher *fsnotify.Watcher) { func WaitForReplacement(filename string, op fsnotify.Op,
watcher *fsnotify.Watcher) {
const sleep_interval = 50 * time.Millisecond const sleep_interval = 50 * time.Millisecond
// Avoid a race when fsnofity.Remove is preceded by fsnotify.Chmod. // Avoid a race when fsnofity.Remove is preceded by fsnotify.Chmod.
if event.Op&fsnotify.Chmod != 0 { if op&fsnotify.Chmod != 0 {
time.Sleep(sleep_interval) time.Sleep(sleep_interval)
} }
for { for {
if _, err := os.Stat(event.Name); err == nil { if _, err := os.Stat(filename); err == nil {
if err := watcher.Add(event.Name); err == nil { if err := watcher.Add(filename); err == nil {
log.Printf("watching resumed for %s", event.Name) log.Printf("watching resumed for %s", filename)
return return
} }
} }
@ -52,7 +53,8 @@ func WatchForUpdates(filename string, done <-chan bool, action func()) bool {
// can't be opened. // can't be opened.
if event.Op&(fsnotify.Remove|fsnotify.Rename|fsnotify.Chmod) != 0 { if event.Op&(fsnotify.Remove|fsnotify.Rename|fsnotify.Chmod) != 0 {
log.Printf("watching interrupted on event: %s", event) log.Printf("watching interrupted on event: %s", event)
WaitForReplacement(event, watcher) watcher.Remove(filename)
WaitForReplacement(filename, event.Op, watcher)
} }
log.Printf("reloading after event: %s", event) log.Printf("reloading after event: %s", event)
action() action()