zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: rest: WriteJson get 200 when Marshal failed. (#1803)

Browse Source 
Only the first WriteHeader call takes effect.
This commit is contained in:
Vee Zhang
2022-04-21 21:55:01 +08:00
committed by GitHub
parent 16c61c6657
commit 94ddb3380e
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rest/httpx/responses.go
View File

@@ -61,12 +61,16 @@ func SetErrorHandler(handler func(error) (int, interface{})) {
// WriteJson writes v as json string into w with code.
func WriteJson(w http.ResponseWriter, code int, v interface{}) {
bs, err := json.Marshal(v)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set(ContentType, ApplicationJson)
w.WriteHeader(code)
if bs, err := json.Marshal(v); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
} else if n, err := w.Write(bs); err != nil {
if n, err := w.Write(bs); err != nil {
// http.ErrHandlerTimeout has been handled by http.TimeoutHandler,
// so it's ignored here.
if err != http.ErrHandlerTimeout {