kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #4276 from tianon/json-stream-newlines 

Add newlines to the JSON stream functions
This commit is contained in:
Michael Crosby 2014-02-26 21:25:42 -05:00
parent 389eba4396 060da572d2
commit 01dc79b3ea
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
utils/streamformatter.go
View File

@ -14,6 +14,10 @@ func NewStreamFormatter(json bool) *StreamFormatter {
return &StreamFormatter{json, false} return &StreamFormatter{json, false}
} }
const streamNewline = "\r\n"
var streamNewlineBytes = []byte(streamNewline)
func (sf *StreamFormatter) FormatStream(str string) []byte { func (sf *StreamFormatter) FormatStream(str string) []byte {
sf.used = true sf.used = true
if sf.json { if sf.json {
@ -21,7 +25,7 @@ func (sf *StreamFormatter) FormatStream(str string) []byte {
if err != nil { if err != nil {
return sf.FormatError(err) return sf.FormatError(err)
} }
return b return append(b, streamNewlineBytes...)
} }
return []byte(str + "\r") return []byte(str + "\r")
} }
@ -34,9 +38,9 @@ func (sf *StreamFormatter) FormatStatus(id, format string, a ...interface{}) []b
if err != nil { if err != nil {
return sf.FormatError(err) return sf.FormatError(err)
} }
return b return append(b, streamNewlineBytes...)
} }
return []byte(str + "\r\n") return []byte(str + streamNewline)
} }
func (sf *StreamFormatter) FormatError(err error) []byte { func (sf *StreamFormatter) FormatError(err error) []byte {
@ -47,11 +51,11 @@ func (sf *StreamFormatter) FormatError(err error) []byte {
jsonError = &JSONError{Message: err.Error()} jsonError = &JSONError{Message: err.Error()}
} }
if b, err := json.Marshal(&JSONMessage{Error: jsonError, ErrorMessage: err.Error()}); err == nil { if b, err := json.Marshal(&JSONMessage{Error: jsonError, ErrorMessage: err.Error()}); err == nil {
return b return append(b, streamNewlineBytes...)
} }
return []byte("{\"error\":\"format error\"}") return []byte("{\"error\":\"format error\"}" + streamNewline)
} }
return []byte("Error: " + err.Error() + "\r\n") return []byte("Error: " + err.Error() + streamNewline)
} }
func (sf *StreamFormatter) FormatProgress(id, action string, progress *JSONProgress) []byte { func (sf *StreamFormatter) FormatProgress(id, action string, progress *JSONProgress) []byte {