refactor newReader

This commit is contained in:
Sridhar Ratnakumar 2014-05-16 17:03:16 -07:00
parent 6dab63b3c0
commit c7e3c77bef
1 changed files with 6 additions and 6 deletions

12
tail.go
View File

@ -214,7 +214,7 @@ func (tail *Tail) tailFileSync() {
} }
} }
tail.reader = tail.newReader() tail.openReader()
// Read line by line. // Read line by line.
for { for {
@ -295,7 +295,7 @@ func (tail *Tail) waitForChanges() error {
return err return err
} }
tail.Logger.Printf("Successfully reopened %s", tail.Filename) tail.Logger.Printf("Successfully reopened %s", tail.Filename)
tail.reader = tail.newReader() tail.openReader()
return nil return nil
} else { } else {
tail.Logger.Printf("Stopping tail as file no longer exists: %s", tail.Filename) tail.Logger.Printf("Stopping tail as file no longer exists: %s", tail.Filename)
@ -308,7 +308,7 @@ func (tail *Tail) waitForChanges() error {
return err return err
} }
tail.Logger.Printf("Successfully reopened truncated %s", tail.Filename) tail.Logger.Printf("Successfully reopened truncated %s", tail.Filename)
tail.reader = tail.newReader() tail.openReader()
return nil return nil
case <-tail.Dying(): case <-tail.Dying():
return ErrStop return ErrStop
@ -316,12 +316,12 @@ func (tail *Tail) waitForChanges() error {
panic("unreachable") panic("unreachable")
} }
func (tail *Tail) newReader() *bufio.Reader { func (tail *Tail) openReader() {
if tail.MaxLineSize > 0 { if tail.MaxLineSize > 0 {
// add 2 to account for newline characters // add 2 to account for newline characters
return bufio.NewReaderSize(tail.file, tail.MaxLineSize+2) tail.reader = bufio.NewReaderSize(tail.file, tail.MaxLineSize+2)
} else { } else {
return bufio.NewReader(tail.file) tail.reader = bufio.NewReader(tail.file)
} }
} }