Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions tail.go
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@ func (tail *Tail) tailFileSync() {

tail.openReader()

if err := tail.watchChanges(); err != nil {
tail.Killf("Error watching for changes on %s: %s", tail.Filename, err)
return
}

var offset int64
var err error

Expand Down Expand Up @@ -331,19 +336,25 @@ func (tail *Tail) tailFileSync() {
}
}

// watchChanges ensures the watcher is running.
func (tail *Tail) watchChanges() error {
if tail.changes != nil {
return nil
}
pos, err := tail.file.Seek(0, os.SEEK_CUR)
if err != nil {
return err
}
tail.changes, err = tail.watcher.ChangeEvents(&tail.Tomb, pos)
return err
}

// waitForChanges waits until the file has been appended, deleted,
// moved or truncated. When moved or deleted - the file will be
// reopened if ReOpen is true. Truncated files are always reopened.
func (tail *Tail) waitForChanges() error {
if tail.changes == nil {
pos, err := tail.file.Seek(0, os.SEEK_CUR)
if err != nil {
return err
}
tail.changes, err = tail.watcher.ChangeEvents(&tail.Tomb, pos)
if err != nil {
return err
}
if err := tail.watchChanges(); err != nil {
return err
}

select {
Expand Down