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

fix jsonmessage in build

Browse source
This commit is contained in:
Victor Vieux 2013-12-06 11:55:56 -08:00 • committed by Guillaume J. Charmes
parent e01732f857
commit 95c0ade04b
4 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buildfile.go
View file

@ -375,7 +375,7 @@ type StdoutFormater struct {
} }
func (sf *StdoutFormater) Write(buf []byte) (int, error) { func (sf *StdoutFormater) Write(buf []byte) (int, error) {
formattedBuf := sf.StreamFormatter.FormatStatus("", "%s", string(buf)) formattedBuf := sf.StreamFormatter.FormatStream(string(buf))
n, err := sf.Writer.Write(formattedBuf) n, err := sf.Writer.Write(formattedBuf)
if n != len(formattedBuf) { if n != len(formattedBuf) {
return n, io.ErrShortWrite return n, io.ErrShortWrite
@ -389,7 +389,7 @@ type StderrFormater struct {
} }
func (sf *StderrFormater) Write(buf []byte) (int, error) { func (sf *StderrFormater) Write(buf []byte) (int, error) {
formattedBuf := sf.StreamFormatter.FormatStatus("", "%s", "\033[91m"+string(buf)+"\033[0m") formattedBuf := sf.StreamFormatter.FormatStream("\033[91m" + string(buf) + "\033[0m")
n, err := sf.Writer.Write(formattedBuf) n, err := sf.Writer.Write(formattedBuf)
if n != len(formattedBuf) { if n != len(formattedBuf) {
return n, io.ErrShortWrite return n, io.ErrShortWrite

2
commands.go
View file

@ -229,8 +229,6 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
if context != nil { if context != nil {
headers.Set("Content-Type", "application/tar") headers.Set("Content-Type", "application/tar")
} }
// Temporary hack to fix displayJSON behavior
cli.isTerminal = false
err = cli.stream("POST", fmt.Sprintf("/build?%s", v.Encode()), body, cli.out, headers) err = cli.stream("POST", fmt.Sprintf("/build?%s", v.Encode()), body, cli.out, headers)
if jerr, ok := err.(*utils.JSONError); ok { if jerr, ok := err.(*utils.JSONError); ok {
return &utils.StatusError{Status: jerr.Message, StatusCode: jerr.Code} return &utils.StatusError{Status: jerr.Message, StatusCode: jerr.Code}

7
utils/jsonmessage.go
View file

@ -66,6 +66,7 @@ func (p *JSONProgress) String() string {
} }
type JSONMessage struct { type JSONMessage struct {
Stream string `json:"stream,omitempty"`
Status string `json:"status,omitempty"` Status string `json:"status,omitempty"`
Progress *JSONProgress `json:"progressDetail,omitempty"` Progress *JSONProgress `json:"progressDetail,omitempty"`
ProgressMessage string `json:"progress,omitempty"` //deprecated ProgressMessage string `json:"progress,omitempty"` //deprecated
@ -87,7 +88,7 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
if isTerminal { if isTerminal {
// <ESC>[2K = erase entire current line // <ESC>[2K = erase entire current line
fmt.Fprintf(out, "%c[2K\r", 27) fmt.Fprintf(out, "%c[2K\r", 27)
endl = "\r\n" endl = "\r"
} }
if jm.Time != 0 { if jm.Time != 0 {
fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0)) fmt.Fprintf(out, "[%s] ", time.Unix(jm.Time, 0))
@ -102,8 +103,10 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
fmt.Fprintf(out, "%s %s%s", jm.Status, jm.Progress.String(), endl) fmt.Fprintf(out, "%s %s%s", jm.Status, jm.Progress.String(), endl)
} else if jm.ProgressMessage != "" { //deprecated } else if jm.ProgressMessage != "" { //deprecated
fmt.Fprintf(out, "%s %s%s", jm.Status, jm.ProgressMessage, endl) fmt.Fprintf(out, "%s %s%s", jm.Status, jm.ProgressMessage, endl)
} else if jm.Stream != "" {
fmt.Fprintf(out, "%s%s", jm.Stream, endl)
} else { } else {
fmt.Fprintf(out, "%s%s", jm.Status, endl) fmt.Fprintf(out, "%s%s\n", jm.Status, endl)
} }
return nil return nil
} }

12
utils/streamformatter.go
View file

@ -14,6 +14,18 @@ func NewStreamFormatter(json bool) *StreamFormatter {
return &StreamFormatter{json, false} return &StreamFormatter{json, false}
} }
func (sf *StreamFormatter) FormatStream(str string) []byte {
sf.used = true
if sf.json {
b, err := json.Marshal(&JSONMessage{Stream: str})
if err != nil {
return sf.FormatError(err)
}
return b
}
return []byte(str + "\r")
}
func (sf *StreamFormatter) FormatStatus(id, format string, a ...interface{}) []byte { func (sf *StreamFormatter) FormatStatus(id, format string, a ...interface{}) []byte {
sf.used = true sf.used = true
str := fmt.Sprintf(format, a...) str := fmt.Sprintf(format, a...)