From c5abc6d470fa6fe3aa53643b57d014c467db5197 Mon Sep 17 00:00:00 2001 From: funkygao Date: Fri, 11 Oct 2013 17:00:29 +0800 Subject: [PATCH 1/2] fix problem of long line EOF --- tail.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tail.go b/tail.go index ec0a2559..5c63a184 100644 --- a/tail.go +++ b/tail.go @@ -146,8 +146,17 @@ func (tail *Tail) reopen() error { } func (tail *Tail) readLine() ([]byte, error) { - line, _, err := tail.reader.ReadLine() - return line, err + line, isPrefix, err := tail.reader.ReadLine() + if !isPrefix { + return line, err + } + + buf := append([]byte(nil), line...) + for isPrefix && err == nil { + line, isPrefix, err = tail.reader.ReadLine() + buf = append(buf, line...) + } + return buf, err } func (tail *Tail) tailFileSync() { From c35925b49b639f1faa61d7c78b5a5a6b2f113e84 Mon Sep 17 00:00:00 2001 From: funkygao Date: Sun, 27 Oct 2013 09:30:07 +0800 Subject: [PATCH 2/2] my pkg --- tail.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tail.go b/tail.go index 5c63a184..bc512734 100644 --- a/tail.go +++ b/tail.go @@ -5,7 +5,7 @@ package tail import ( "bufio" "fmt" - "github.com/ActiveState/tail/watch" + "github.com/funkygao/tail/watch" "io" "launchpad.net/tomb" "log"