unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 282 Wiki Activity

Fixing too large offsets for default runtime logs (#1587)

Browse Source
This commit is contained in:
Janos Dobronszki 2020-04-28 14:42:15 +02:00 committed by GitHub
parent 52861310b0
commit da66561d1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
runtime/default.go
View File

@ -294,11 +294,23 @@ func (r *runtime) Logs(s *Service, options ...LogsOption) (LogStream, error) {
return nil, fmt.Errorf("Log file %v does not exists", fpath) return nil, fmt.Errorf("Log file %v does not exists", fpath)
} }
// have to check file size to avoid too big of a seek
fi, err := os.Stat(fpath)
if err != nil {
return nil, err
}
size := fi.Size()
whence := 2 whence := 2
// Multiply by length of an average line of log in bytes // Multiply by length of an average line of log in bytes
offset := -1 * lopts.Count * 200 offset := lopts.Count * 200
t, err := tail.TailFile(logFile(s.Name), tail.Config{Follow: lopts.Stream, Location: &tail.SeekInfo{ if offset > size {
offset = size
}
offset *= -1
t, err := tail.TailFile(fpath, tail.Config{Follow: lopts.Stream, Location: &tail.SeekInfo{
Whence: whence, Whence: whence,
Offset: int64(offset), Offset: int64(offset),
}, Logger: tail.DiscardingLogger}) }, Logger: tail.DiscardingLogger})
@ -354,6 +366,7 @@ func (l *logStream) Stop() error {
close(l.stream) close(l.stream)
err := l.tail.Stop() err := l.tail.Stop()
if err != nil { if err != nil {
logger.Errorf("Error stopping tail: %v", err)
return err return err
} }
} }