TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

logtail/filch: use bufio.ScanLines

Browse Source 
splitLines here is identical to bufio.ScanLines,
except that bufio.ScanLines removes \r in addition to \n.
Trailing carriage returns shouldn't matter for our uses.
Since bufio.ScanLines is the default for a new bufio.Scanner,
we can delete the calls to Split too.
This commit is contained in:
Josh Bleecher Snyder 2021-02-10 12:03:13 -08:00
parent 7e201806b1
commit 5555728c72
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
logtail/filch/filch.go
View File

@ -8,7 +8,6 @@
import ( import (
"bufio" "bufio"
"bytes"
"fmt" "fmt"
"io" "io"
"os" "os"
@ -53,7 +52,6 @@ func (f *Filch) TryReadLine() ([]byte, error) {
return nil, err return nil, err
} }
f.altscan = bufio.NewScanner(f.alt) f.altscan = bufio.NewScanner(f.alt)
f.altscan.Split(splitLines)
return f.scan() return f.scan()
} }
@ -188,7 +186,6 @@ func New(filePrefix string, opts Options) (f *Filch, err error) {
} }
if f.recovered > 0 { if f.recovered > 0 {
f.altscan = bufio.NewScanner(f.alt) f.altscan = bufio.NewScanner(f.alt)
f.altscan.Split(splitLines)
} }
f.OrigStderr = nil f.OrigStderr = nil
@ -228,16 +225,3 @@ func moveContents(dst, src *os.File) (err error) {
} }
return nil return nil
} }
func splitLines(data []byte, atEOF bool) (advance int, token []byte, err error) {
if atEOF && len(data) == 0 {
return 0, nil, nil
}
if i := bytes.IndexByte(data, '\n'); i >= 0 {
return i + 1, data[0 : i+1], nil
}
if atEOF {
return len(data), data, nil
}
return 0, nil, nil
}