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

Make sure log pipes are closed

Browse source 
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2015-05-06 21:09:27 -04:00
parent a15859d7a9
commit 9b30befa9d
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"
"io"
"time"
"github.com/Sirupsen/logrus"
)
type JSONLog struct {
@ -37,15 +35,16 @@ func WriteLog(src io.Reader, dst io.Writer, format string, since time.Time) erro
l := &JSONLog{}
for {
l.Reset()
if err := dec.Decode(l); err == io.EOF {
if err := dec.Decode(l); err != nil {
if err == io.EOF {
return nil
} else if err != nil {
logrus.Printf("Error streaming logs: %s", err)
}
return err
}
if !since.IsZero() && l.Created.Before(since) {
continue
}
line, err := l.Format(format)
if err != nil {
return err