perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vendor: Update github.com/syncthing/notify (fixes #4885) (#4894)

Browse Source
This commit is contained in:
Simon Frei
2018-04-20 17:01:03 +02:00
committed by GitHub
parent 25bf406f0e
commit 3d02fcd473
6 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/github.com/syncthing/notify/tree_recursive.go generated vendored
View File

@@ -154,7 +154,7 @@ func (t *recursiveTree) dispatch() {
// Watch TODO(rjeczalik)
func (t *recursiveTree) Watch(path string, c chan<- EventInfo,
doNotWatch func(string) bool, events ...Event) error {
_ DoNotWatchFn, events ...Event) error {
if c == nil {
panic("notify: Watch using nil channel")
}
@@ -233,7 +233,7 @@ func (t *recursiveTree) Watch(path string, c chan<- EventInfo,
children = append(children, nd)
return errSkip
}
switch must(cur.Walk(fn)); len(children) {
switch must(cur.Walk(fn, nil)); len(children) {
case 0:
// no child watches, cur holds a new watch
case 1:
@@ -332,14 +332,14 @@ func (t *recursiveTree) Stop(c chan<- EventInfo) {
watchDel(nd, c, all)
return nil
}
err = nonil(err, e, nd.Walk(fn))
err = nonil(err, e, nd.Walk(fn, nil))
// TODO(rjeczalik): if e != nil store dummy chan in nd.Watch just to
// retry un/rewatching next time and/or let the user handle the failure
// vie Error event?
return errSkip
}
t.rw.Lock()
e := t.root.Walk("", fn) // TODO(rjeczalik): use max root per c
e := t.root.Walk("", fn, nil) // TODO(rjeczalik): use max root per c
t.rw.Unlock()
if e != nil {
err = nonil(err, e)