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

Move server and buildfile into server pkg

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-03-11 10:40:06 -07:00
parent 5c6d54073f
commit 5239aa1f11
5 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
builtins/builtins.go
View file

@ -3,9 +3,9 @@ package builtins
import (
"github.com/dotcloud/docker/engine"
"github.com/dotcloud/docker"
"github.com/dotcloud/docker/api"
"github.com/dotcloud/docker/networkdriver/lxc"
"github.com/dotcloud/docker/server"
)
func Register(eng *engine.Engine) {
@ -34,6 +34,6 @@ func remote(eng *engine.Engine) {
// These components should be broken off into plugins of their own.
//
func daemon(eng *engine.Engine) {
eng.Register("initserver", docker.InitServer)
eng.Register("initserver", server.InitServer)
eng.Register("init_networkdriver", lxc.InitDriver)
}

30
buildfile.go → server/buildfile.go
View file

@ -1,4 +1,4 @@
package docker
package server
import (
"crypto/sha256"
@ -591,34 +591,6 @@ func (b *buildFile) CmdAdd(args string) error {
return nil
}
type StdoutFormater struct {
io.Writer
*utils.StreamFormatter
}
func (sf *StdoutFormater) Write(buf []byte) (int, error) {
formattedBuf := sf.StreamFormatter.FormatStream(string(buf))
n, err := sf.Writer.Write(formattedBuf)
if n != len(formattedBuf) {
return n, io.ErrShortWrite
}
return len(buf), err
}
type StderrFormater struct {
io.Writer
*utils.StreamFormatter
}
func (sf *StderrFormater) Write(buf []byte) (int, error) {
formattedBuf := sf.StreamFormatter.FormatStream("\033[91m" + string(buf) + "\033[0m")
n, err := sf.Writer.Write(formattedBuf)
if n != len(formattedBuf) {
return n, io.ErrShortWrite
}
return len(buf), err
}
func (b *buildFile) create() (*runtime.Container, error) {
if b.image == "" {
return nil, fmt.Errorf("Please provide a source image with `from` prior to run")

6
server.go → server/server.go
View file

@ -1,4 +1,4 @@
package docker
package server
import (
"encoding/json"
@ -456,11 +456,11 @@ func (srv *Server) Build(job *engine.Job) engine.Status {
sf := utils.NewStreamFormatter(job.GetenvBool("json"))
b := NewBuildFile(srv,
&StdoutFormater{
&utils.StdoutFormater{
Writer: job.Stdout,
StreamFormatter: sf,
},
&StderrFormater{
&utils.StderrFormater{
Writer: job.Stdout,
StreamFormatter: sf,
},

2
server_unit_test.go → server/server_unit_test.go
View file

@ -1,4 +1,4 @@
package docker
package server
import (
"github.com/dotcloud/docker/utils"

29
utils/streamformatter.go
View file

@ -3,6 +3,7 @@ package utils
import (
"encoding/json"
"fmt"
"io"
)
type StreamFormatter struct {
@ -90,3 +91,31 @@ func (sf *StreamFormatter) Used() bool {
func (sf *StreamFormatter) Json() bool {
return sf.json
}
type StdoutFormater struct {
io.Writer
*StreamFormatter
}
func (sf *StdoutFormater) Write(buf []byte) (int, error) {
formattedBuf := sf.StreamFormatter.FormatStream(string(buf))
n, err := sf.Writer.Write(formattedBuf)
if n != len(formattedBuf) {
return n, io.ErrShortWrite
}
return len(buf), err
}
type StderrFormater struct {
io.Writer
*StreamFormatter
}
func (sf *StderrFormater) Write(buf []byte) (int, error) {
formattedBuf := sf.StreamFormatter.FormatStream("\033[91m" + string(buf) + "\033[0m")
n, err := sf.Writer.Write(formattedBuf)
if n != len(formattedBuf) {
return n, io.ErrShortWrite
}
return len(buf), err
}