alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Addressing comments

Browse Source 
What's new?
  - unmarshal JSON response only in case of HTTP response writer
This commit is contained in:
Denis Makogon
2017-09-29 23:57:04 +03:00
parent 783490dc79
commit 3fb040f293
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
api/agent/protocol/json.go
View File

@@ -1,6 +1,7 @@
package protocol
import (
"bufio"
"bytes"
"encoding/json"
"fmt"
@@ -51,45 +52,35 @@ func (h *JSONProtocol) Dispatch(w io.Writer, req *http.Request) error {
return respondWithError(
w, fmt.Errorf("error marshalling JSONInput: %s", err.Error()))
}
// TODO: write in chunks, how big should chunk be?
_, err = h.in.Write(b)
if err != nil {
return respondWithError(
w, fmt.Errorf("error writing JSON object to function's STDIN: %s", err.Error()))
}
// this has to be done for pulling out:
// - status code
// - body
jout := new(JSONIO)
dec := json.NewDecoder(h.out)
if err := dec.Decode(jout); err != nil {
return respondWithError(
w, fmt.Errorf("unable to decode JSON response object: %s", err.Error()))
}
if rw, ok := w.(http.ResponseWriter); ok {
rw.WriteHeader(jout.StatusCode)
outBytes, err := json.Marshal(jout.Body)
if err != nil {
// this has to be done for pulling out:
// - status code
// - body
jout := new(JSONIO)
dec := json.NewDecoder(h.out)
if err := dec.Decode(jout); err != nil {
return respondWithError(
w, fmt.Errorf("unable to marshal JSON response object: %s", err.Error()))
w, fmt.Errorf("unable to decode JSON response object: %s", err.Error()))
}
_, err = rw.Write(outBytes) // TODO timeout
rw.WriteHeader(jout.StatusCode)
_, err = rw.Write([]byte(jout.Body)) // TODO timeout
if err != nil {
return respondWithError(
w, fmt.Errorf("unable to write JSON response object: %s", err.Error()))
}
} else {
// logs can just copy the full thing in there, headers and all.
outBytes, err := json.Marshal(jout.Body)
_, err = io.Copy(w, bufio.NewReader(h.out))
if err != nil {
return respondWithError(
w, fmt.Errorf("unable to marshal JSON response object: %s", err.Error()))
}
_, err = w.Write(outBytes) // TODO timeout
if err != nil {
return respondWithError(
w, fmt.Errorf("unable to write JSON response object: %s", err.Error()))
w, fmt.Errorf("error reading function response: %s", err.Error()))
}
}
return nil