go-kit
/
tail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue 97 Fixing deferred RemoveWatch() due to which tailing stops (gets stuck) in certain conditions

This commit is contained in:
Arun Mathew 2016-08-01 15:48:42 +09:00
parent 3ca1edc9ed
commit 48cd00098f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
watch/inotify.go
View File

@ -75,7 +75,6 @@ func (fw *InotifyFileWatcher) ChangeEvents(t *tomb.Tomb, pos int64) (*FileChange
fw.Size = pos fw.Size = pos
go func() { go func() {
defer RemoveWatch(fw.Filename)
events := Events(fw.Filename) events := Events(fw.Filename)
@ -88,9 +87,11 @@ func (fw *InotifyFileWatcher) ChangeEvents(t *tomb.Tomb, pos int64) (*FileChange
select { select {
case evt, ok = <-events: case evt, ok = <-events:
if !ok { if !ok {
RemoveWatch(fw.Filename)
return return
} }
case <-t.Dying(): case <-t.Dying():
RemoveWatch(fw.Filename)
return return
} }
@ -99,6 +100,7 @@ func (fw *InotifyFileWatcher) ChangeEvents(t *tomb.Tomb, pos int64) (*FileChange
fallthrough fallthrough
case evt.Op&fsnotify.Rename == fsnotify.Rename: case evt.Op&fsnotify.Rename == fsnotify.Rename:
RemoveWatch(fw.Filename)
changes.NotifyDeleted() changes.NotifyDeleted()
return return
@ -106,6 +108,7 @@ func (fw *InotifyFileWatcher) ChangeEvents(t *tomb.Tomb, pos int64) (*FileChange
fi, err := os.Stat(fw.Filename) fi, err := os.Stat(fw.Filename)
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
RemoveWatch(fw.Filename)
changes.NotifyDeleted() changes.NotifyDeleted()
return return
} }