Restores error propagation from fsnotify.Watcher.Add.

hpcloud · Mar 21, 2017 · 2e79377 · 2e79377
1 parent 669c440
commit 2e79377
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/watch/inotify.go b/watch/inotify.go
@@ -99,7 +99,7 @@ func (fw *InotifyFileWatcher) ChangeEvents(t *tomb.Tomb, pos int64) (*FileChange
 			//With an open fd, unlink(fd) - inotify returns IN_ATTRIB (==fsnotify.Chmod)
 			case evt.Op&fsnotify.Chmod == fsnotify.Chmod:
 				if _, err := os.Stat(fw.Filename); err != nil {
-					if ! os.IsNotExist(err) {
+					if !os.IsNotExist(err) {
 						return
 					}
 				}

diff --git a/watch/inotify_tracker.go b/watch/inotify_tracker.go
@@ -153,7 +153,9 @@ func (shared *InotifyTracker) addWatch(winfo *watchInfo) error {
 	if shared.watchNums[fname] == 0 {
 		err = shared.watcher.Add(fname)
 	}
-	shared.watchNums[fname]++
+	if err == nil {
+		shared.watchNums[fname]++
+	}
 	return err
 }