beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Close logs pipes and catch write errors

Browse source 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
This commit is contained in:
Alexandr Morozov 2014-09-22 10:55:46 +04:00
parent fd3f2e175f
commit a7ee201ee8
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/logs.go
View file

@ -114,12 +114,14 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {
errors := make(chan error, 2)
if stdout {
stdoutPipe := container.StdoutLogPipe()
defer stdoutPipe.Close()
go func() {
errors <- jsonlog.WriteLog(stdoutPipe, job.Stdout, format)
}()
}
if stderr {
stderrPipe := container.StderrLogPipe()
defer stderrPipe.Close()
go func() {
errors <- jsonlog.WriteLog(stderrPipe, job.Stderr, format)
}()

4
pkg/jsonlog/jsonlog.go
View file

@ -40,6 +40,8 @@ func WriteLog(src io.Reader, dst io.Writer, format string) error {
if err != nil {
return err
}
fmt.Fprintf(dst, "%s", line)
if _, err := io.WriteString(dst, line); err != nil {
return err
}
}
}