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

update change log, gofmt and remove debug prints

This commit is contained in:
Sridhar Ratnakumar 2013-05-28 13:53:19 -07:00
parent 644891ebbc
commit 976fc15b81
4 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -1,6 +1,8 @@
# May, 2013 # May, 2013
* Recognize deletions/renames when using polling file watcher (PR #1) * Recognize deletions/renames when using polling file watcher (PR #1)
* Detect file truncation
* Fix potential race condition when reopening the file (issue 5)
# Feb, 2013 # Feb, 2013

2
tail.go
View File

@ -186,7 +186,6 @@ func (tail *Tail) tailFileSync() {
if !ok { if !ok {
changes = nil // XXX: how to kill changes' goroutine? changes = nil // XXX: how to kill changes' goroutine?
log.Println("Changes channel is closed.")
// File got deleted/renamed/truncated. // File got deleted/renamed/truncated.
if tail.ReOpen { if tail.ReOpen {
// TODO: no logging in a library? // TODO: no logging in a library?
@ -208,7 +207,6 @@ func (tail *Tail) tailFileSync() {
} }
} }
case <-tail.Dying(): case <-tail.Dying():
log.Println("Dying..")
tail.close() tail.close()
return return
} }

4
tail_test.go
View File

@ -138,7 +138,6 @@ func TestReOpenPolling(_t *testing.T) {
_TestReOpen(_t, true) _TestReOpen(_t, true)
} }
func _TestReSeek(_t *testing.T, poll bool) { func _TestReSeek(_t *testing.T, poll bool) {
var name string var name string
if poll { if poll {
@ -176,7 +175,7 @@ func _TestReSeek(_t *testing.T, poll bool) {
<-time.After(100 * time.Millisecond) <-time.After(100 * time.Millisecond)
t.RemoveFile("test.txt") t.RemoveFile("test.txt")
println("Stopping...") println("Stopping (RESEEK)...")
tail.Stop() tail.Stop()
} }
@ -191,7 +190,6 @@ func TestReSeekPolling(_t *testing.T) {
_TestReSeek(_t, true) _TestReSeek(_t, true)
} }
// Test library // Test library
type TailTest struct { type TailTest struct {

13
watch.go
View File

@ -6,9 +6,8 @@ import (
"github.com/howeyc/fsnotify" "github.com/howeyc/fsnotify"
"os" "os"
"path/filepath" "path/filepath"
"time"
"sync" "sync"
"fmt" "time"
) )
// FileWatcher monitors file-level events. // FileWatcher monitors file-level events.
@ -34,7 +33,6 @@ func NewInotifyFileWatcher(filename string) *InotifyFileWatcher {
} }
func (fw *InotifyFileWatcher) BlockUntilExists() error { func (fw *InotifyFileWatcher) BlockUntilExists() error {
fmt.Println("BUE(inotify): creating watcher")
w, err := fsnotify.NewWatcher() w, err := fsnotify.NewWatcher()
if err != nil { if err != nil {
return err return err
@ -50,7 +48,6 @@ func (fw *InotifyFileWatcher) BlockUntilExists() error {
} }
defer w.RemoveWatch(filepath.Dir(fw.Filename)) defer w.RemoveWatch(filepath.Dir(fw.Filename))
fmt.Println("BUE(inotify): does file exist now?")
// Do a real check now as the file might have been created before // Do a real check now as the file might have been created before
// calling `WatchFlags` above. // calling `WatchFlags` above.
if _, err = os.Stat(fw.Filename); !os.IsNotExist(err) { if _, err = os.Stat(fw.Filename); !os.IsNotExist(err) {
@ -58,10 +55,8 @@ func (fw *InotifyFileWatcher) BlockUntilExists() error {
return err return err
} }
fmt.Printf("BUE(inotify): checking events (last: %v)\n", err)
for { for {
evt := <-w.Event evt := <-w.Event
fmt.Printf("BUE(inotify): got event: %v\n", evt)
if evt.Name == fw.Filename { if evt.Name == fw.Filename {
break break
} }
@ -93,7 +88,6 @@ func (fw *InotifyFileWatcher) ChangeEvents(fi os.FileInfo) chan bool {
prevSize := fw.Size prevSize := fw.Size
evt := <-w.Event evt := <-w.Event
fmt.Printf("inotify change evt: %v\n", evt)
switch { switch {
case evt.IsDelete(): case evt.IsDelete():
fallthrough fallthrough
@ -109,7 +103,6 @@ func (fw *InotifyFileWatcher) ChangeEvents(fi os.FileInfo) chan bool {
} }
fw.Size = fi.Size() fw.Size = fi.Size()
fmt.Printf("WATCH(inotify): prevSize=%d; fs.Size=%d\n", prevSize, fw.Size)
if prevSize > 0 && prevSize > fw.Size { if prevSize > 0 && prevSize > fw.Size {
return return
} }
@ -147,7 +140,6 @@ func (fw *PollingFileWatcher) BlockUntilExists() error {
return err return err
} }
time.Sleep(POLL_DURATION) time.Sleep(POLL_DURATION)
println("blocking..")
} }
panic("unreachable") panic("unreachable")
} }
@ -198,7 +190,6 @@ func (fw *PollingFileWatcher) ChangeEvents(origFi os.FileInfo) chan bool {
// Was the file truncated? // Was the file truncated?
fw.Size = fi.Size() fw.Size = fi.Size()
fmt.Printf("WATCH(poll): prevSize=%d; fs.Size=%d\n", prevSize, fw.Size)
if prevSize > 0 && prevSize > fw.Size { if prevSize > 0 && prevSize > fw.Size {
once.Do(stopAndClose) once.Do(stopAndClose)
continue continue
@ -212,8 +203,6 @@ func (fw *PollingFileWatcher) ChangeEvents(origFi os.FileInfo) chan bool {
case ch <- true: case ch <- true:
default: default:
} }
}else{
fmt.Printf("polling; not modified: %v == %v\n", modTime, prevModTime)
} }
} }
}() }()