mirrors/pspy
1
0
Fork 0
mirror of https://github.com/DominicBreuker/pspy.git synced 2025-12-21 03:34:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor again

Browse Source
This commit is contained in:
Dominic Breuker
2018-03-12 08:24:57 +01:00
parent b7c5e0b984
commit 53bb0c2566
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
internal/fswatcher/fswatcher.go
View File

@@ -77,11 +77,7 @@ func (fs *FSWatcher) addWatchersToDir(dir string, depth int, errCh chan error) {
return
}
done, err := fs.handleNextWalkerResult(dirCh, walkErrCh)
if err != nil {
errCh <- err
}
if done {
if done := fs.handleNextWalkerResult(dirCh, walkErrCh, errCh); done {
return
}
}
@@ -91,19 +87,19 @@ func (fs *FSWatcher) maximumWatchersExceeded() bool {
return fs.maxWatchers > 0 && fs.i.NumWatchers() >= fs.maxWatchers
}
func (fs *FSWatcher) handleNextWalkerResult(dirCh chan string, walkErrCh chan error) (bool, error) {
func (fs *FSWatcher) handleNextWalkerResult(dirCh chan string, walkErrCh chan error, errCh chan error) bool {
select {
case err := <-walkErrCh:
return false, fmt.Errorf("adding inotify watchers: %v", err)
errCh <- fmt.Errorf("adding inotify watchers: %v", err)
case dir, ok := <-dirCh:
if !ok {
return true, nil // finished
return true
}
if err := fs.i.Watch(dir); err != nil {
return false, fmt.Errorf("Can't create watcher: %v", err)
errCh <- fmt.Errorf("Can't create watcher: %v", err)
}
}
return false, nil
return false
}
func (fs *FSWatcher) Run() (chan struct{}, chan string, chan error) {