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/container.go b/daemon/container.go index 9517e28469..1eaac8f3b5 100644 --- a/daemon/container.go +++ b/daemon/container.go @@ -22,12 +22,12 @@ import ( "github.com/docker/docker/image" "github.com/docker/docker/links" "github.com/docker/docker/nat" + "github.com/docker/docker/pkg/broadcastwriter" "github.com/docker/docker/pkg/networkfs/etchosts" "github.com/docker/docker/pkg/networkfs/resolvconf" "github.com/docker/docker/pkg/symlink" "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" - "github.com/docker/docker/utils/broadcastwriter" "github.com/docker/libcontainer/devices" "github.com/docker/libcontainer/label" ) diff --git a/daemon/daemon.go b/daemon/daemon.go index fcc0e108fe..2dab2523b2 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -26,6 +26,7 @@ import ( "github.com/docker/docker/engine" "github.com/docker/docker/graph" "github.com/docker/docker/image" + "github.com/docker/docker/pkg/broadcastwriter" "github.com/docker/docker/pkg/graphdb" "github.com/docker/docker/pkg/namesgenerator" "github.com/docker/docker/pkg/networkfs/resolvconf" @@ -35,7 +36,6 @@ import ( "github.com/docker/docker/pkg/truncindex" "github.com/docker/docker/runconfig" "github.com/docker/docker/utils" - "github.com/docker/docker/utils/broadcastwriter" "github.com/docker/libcontainer/label" ) 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 diff --git a/utils/broadcastwriter/broadcastwriter.go b/pkg/broadcastwriter/broadcastwriter.go similarity index 88% rename from utils/broadcastwriter/broadcastwriter.go rename to pkg/broadcastwriter/broadcastwriter.go index f094744e37..a16d8de5f7 100644 --- a/utils/broadcastwriter/broadcastwriter.go +++ b/pkg/broadcastwriter/broadcastwriter.go @@ -4,10 +4,11 @@ import ( "bytes" "encoding/json" "io" + "log" "sync" "time" - "github.com/docker/docker/utils" + "github.com/docker/docker/pkg/jsonlog" ) // BroadcastWriter accumulate multiple io.WriteCloser by stream. @@ -19,7 +20,7 @@ type BroadcastWriter struct { // AddWriter adds new io.WriteCloser for stream. // If stream is "", then all writes proceed as is. Otherwise every line from -// input will be packed to serialized utils.JSONLog. +// input will be packed to serialized jsonlog.JSONLog. func (w *BroadcastWriter) AddWriter(writer io.WriteCloser, stream string) { w.Lock() if _, ok := w.streams[stream]; !ok { @@ -53,9 +54,9 @@ func (w *BroadcastWriter) Write(p []byte) (n int, err error) { if stream == "" { continue } - b, err := json.Marshal(utils.JSONLog{Log: line, Stream: stream, Created: created}) + b, err := json.Marshal(jsonlog.JSONLog{Log: line, Stream: stream, Created: created}) if err != nil { - utils.Errorf("Error making JSON log line: %s", err) + log.Printf("Error making JSON log line: %s", err) continue } b = append(b, '\n') diff --git a/utils/broadcastwriter/broadcastwriter_test.go b/pkg/broadcastwriter/broadcastwriter_test.go similarity index 100% rename from utils/broadcastwriter/broadcastwriter_test.go rename to pkg/broadcastwriter/broadcastwriter_test.go diff --git a/pkg/jsonlog/jsonlog.go b/pkg/jsonlog/jsonlog.go new file mode 100644 index 0000000000..ecf4457cf9 --- /dev/null +++ b/pkg/jsonlog/jsonlog.go @@ -0,0 +1,45 @@ +package jsonlog + +import ( + "encoding/json" + "fmt" + "io" + "log" + "time" +) + +type JSONLog struct { + Log string `json:"log,omitempty"` + Stream string `json:"stream,omitempty"` + Created time.Time `json:"time"` +} + +func (jl *JSONLog) Format(format string) (string, error) { + if format == "" { + return jl.Log, nil + } + if format == "json" { + m, err := json.Marshal(jl) + return string(m), err + } + return fmt.Sprintf("[%s] %s", jl.Created.Format(format), jl.Log), nil +} + +func WriteLog(src io.Reader, dst io.WriteCloser, format string) error { + dec := json.NewDecoder(src) + for { + l := &JSONLog{} + + if err := dec.Decode(l); err == io.EOF { + return nil + } else if err != nil { + log.Printf("Error streaming logs: %s", err) + return err + } + line, err := l.Format(format) + if err != nil { + return err + } + fmt.Fprintf(dst, "%s", line) + } +} diff --git a/utils/utils.go b/utils/utils.go index 38cb906fc8..8dea2af6f2 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -6,7 +6,6 @@ import ( "crypto/sha1" "crypto/sha256" "encoding/hex" - "encoding/json" "fmt" "io" "io/ioutil" @@ -19,7 +18,6 @@ import ( "strings" "sync" "syscall" - "time" "github.com/docker/docker/dockerversion" ) @@ -264,42 +262,6 @@ func (r *bufReader) Close() error { return closer.Close() } -type JSONLog struct { - Log string `json:"log,omitempty"` - Stream string `json:"stream,omitempty"` - Created time.Time `json:"time"` -} - -func (jl *JSONLog) Format(format string) (string, error) { - if format == "" { - return jl.Log, nil - } - if format == "json" { - m, err := json.Marshal(jl) - return string(m), err - } - return fmt.Sprintf("[%s] %s", jl.Created.Format(format), jl.Log), nil -} - -func WriteLog(src io.Reader, dst io.WriteCloser, format string) error { - dec := json.NewDecoder(src) - for { - l := &JSONLog{} - - if err := dec.Decode(l); err == io.EOF { - return nil - } else if err != nil { - Errorf("Error streaming logs: %s", err) - return err - } - line, err := l.Format(format) - if err != nil { - return err - } - fmt.Fprintf(dst, "%s", line) - } -} - func GetTotalUsedFds() int { if fds, err := ioutil.ReadDir(fmt.Sprintf("/proc/%d/fd", os.Getpid())); err != nil { Errorf("Error opening /proc/%d/fd: %s", os.Getpid(), err)