From bd373712d069f5f1f8d65bc25808a068a9afdd13 Mon Sep 17 00:00:00 2001 From: Erik Hollensbe Date: Wed, 6 Aug 2014 16:45:04 -0700 Subject: [PATCH] port usage of jsonlog to the new daemon files which were refactored recently. Docker-DCO-1.1-Signed-off-by: Erik Hollensbe (github: erikh) --- daemon/attach.go | 3 ++- daemon/logs.go | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/daemon/attach.go b/daemon/attach.go index ad8649f4e1..2c65956a58 100644 --- a/daemon/attach.go +++ b/daemon/attach.go @@ -8,6 +8,7 @@ import ( "time" "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/jsonlog" "github.com/docker/docker/utils" ) @@ -57,7 +58,7 @@ func (daemon *Daemon) ContainerAttach(job *engine.Job) engine.Status { } else { dec := json.NewDecoder(cLog) for { - l := &utils.JSONLog{} + l := &jsonlog.JSONLog{} if err := dec.Decode(l); err == io.EOF { break diff --git a/daemon/logs.go b/daemon/logs.go index edfffac4ff..f78a62d046 100644 --- a/daemon/logs.go +++ b/daemon/logs.go @@ -12,6 +12,7 @@ import ( "github.com/docker/docker/pkg/tailfile" "github.com/docker/docker/engine" + "github.com/docker/docker/pkg/jsonlog" "github.com/docker/docker/utils" ) @@ -89,7 +90,7 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status { } dec := json.NewDecoder(cLog) for { - l := &utils.JSONLog{} + l := &jsonlog.JSONLog{} if err := dec.Decode(l); err == io.EOF { break @@ -115,13 +116,13 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status { if stdout { stdoutPipe := container.StdoutLogPipe() go func() { - errors <- utils.WriteLog(stdoutPipe, job.Stdout, format) + errors <- jsonlog.WriteLog(stdoutPipe, job.Stdout, format) }() } if stderr { stderrPipe := container.StderrLogPipe() go func() { - errors <- utils.WriteLog(stderrPipe, job.Stderr, format) + errors <- jsonlog.WriteLog(stderrPipe, job.Stderr, format) }() } err := <-errors