kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #7329 from erikh/move_broadcastwriter

Browse source 
Cleanup: utils/broadcastwriter -> pkg/broadcastwriter
This commit is contained in:
Michael Crosby 2014-08-07 14:51:42 -07:00
commit bc9f5cdeb5
8 changed files with 58 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/attach.go
View file

@ -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

2
daemon/container.go
View file

@ -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"
)

2
daemon/daemon.go
View file

@ -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"
)

7
daemon/logs.go
View file

@ -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

9
utils/broadcastwriter/broadcastwriter.go → pkg/broadcastwriter/broadcastwriter.go
View file

@ -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')

0
utils/broadcastwriter/broadcastwriter_test.go → pkg/broadcastwriter/broadcastwriter_test.go
View file

45
pkg/jsonlog/jsonlog.go Normal file
View file

@ -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)
}
}

38
utils/utils.go
View file

@ -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)