Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

newline between JSON messages #931

Merged
merged 3 commits into from
May 10, 2019
Merged

newline between JSON messages #931

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58c9a03
newline between JSON messages from JSONPb.Encode
jhump May 9, 2019
a92ddfb
use j.Delimiter()
jhump May 9, 2019
1b30b06
fix jsonpb tests
jhump May 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion runtime/marshal_jsonpb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,15 @@ func (d DecoderWrapper) Decode(v interface{}) error {

// NewEncoder returns an Encoder which writes JSON stream into "w".
func (j *JSONPb) NewEncoder(w io.Writer) Encoder {
return EncoderFunc(func(v interface{}) error { return j.marshalTo(w, v) })
return EncoderFunc(func(v interface{}) error {
if err := j.marshalTo(w, v); err != nil {
return err
}
// mimic json.Encoder by adding a newline (makes output
// easier to read when it contains multiple encoded items)
_, err := w.Write([]byte("\n"))
return err
})
johanbrandhorst marked this conversation as resolved.
Show resolved Hide resolved
}

func unmarshalJSONPb(data []byte, v interface{}) error {
Expand Down