vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow

Browse source 
Make sure log pipes are closed
This commit is contained in:
Jessie Frazelle 2015-05-12 13:52:49 -07:00
commit 88a6b39bd3
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
jsonlog/jsonlog.go
View file

@ -5,8 +5,6 @@ import (
"fmt" "fmt"
"io" "io"
"time" "time"
"github.com/Sirupsen/logrus"
) )
type JSONLog struct { type JSONLog struct {
@ -37,15 +35,16 @@ func WriteLog(src io.Reader, dst io.Writer, format string, since time.Time) erro
l := &JSONLog{} l := &JSONLog{}
for { for {
l.Reset() l.Reset()
if err := dec.Decode(l); err == io.EOF { if err := dec.Decode(l); err != nil {
if err == io.EOF {
return nil return nil
} else if err != nil { }
logrus.Printf("Error streaming logs: %s", err)
return err return err
} }
if !since.IsZero() && l.Created.Before(since) { if !since.IsZero() && l.Created.Before(since) {
continue continue
} }
line, err := l.Format(format) line, err := l.Format(format)
if err != nil { if err != nil {
return err return err