go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-03-17 21:07:54 +02:00
Code Issues Releases Activity

http: fix encodeError can't write response header (#782)

Browse Source 
* http: fix encodeError can't write response header
* http: not handle Write error
This commit is contained in:
Mikado 2021-03-18 00:04:37 +08:00 committed by GitHub
parent 8e21de5ea8
commit 4e2ae2077d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
transport/http/handle.go
View File

@ -6,6 +6,7 @@ import (
"strings"
"github.com/go-kratos/kratos/v2/encoding"
"github.com/go-kratos/kratos/v2/encoding/json"
"github.com/go-kratos/kratos/v2/errors"
"github.com/go-kratos/kratos/v2/middleware"
"github.com/go-kratos/kratos/v2/transport/http/binding"
@ -95,25 +96,17 @@ func decodeRequest(req *http.Request, v interface{}) error {
// encodeResponse encodes the object to the HTTP response.
func encodeResponse(w http.ResponseWriter, r *http.Request, v interface{}) error {
var codec encoding.Codec
for _, accept := range r.Header[acceptHeader] {
if codec = encoding.GetCodec(contentSubtype(accept)); codec != nil {
break
}
}
if codec == nil {
codec = encoding.GetCodec("json")
}
codec := codecForRequest(r)
data, err := codec.Marshal(v)
if err != nil {
return err
}
w.Header().Set(contentTypeHeader, contentType(codec.Name()))
w.Write(data)
_, _ = w.Write(data)
return nil
}
// encodeError encodes the erorr to the HTTP response.
// encodeError encodes the error to the HTTP response.
func encodeError(w http.ResponseWriter, r *http.Request, err error) {
se, ok := errors.FromError(err)
if !ok {
@ -122,8 +115,25 @@ func encodeError(w http.ResponseWriter, r *http.Request, err error) {
Message: err.Error(),
}
}
codec := codecForRequest(r)
data, _ := codec.Marshal(se)
w.Header().Set(contentTypeHeader, contentType(codec.Name()))
w.WriteHeader(se.HTTPStatus())
encodeResponse(w, r, se)
_, _ = w.Write(data)
}
// codecForRequest get encoding.Codec via http.Request
func codecForRequest(r *http.Request) encoding.Codec {
var codec encoding.Codec
for _, accept := range r.Header[acceptHeader] {
if codec = encoding.GetCodec(contentSubtype(accept)); codec != nil {
break
}
}
if codec == nil {
codec = encoding.GetCodec(json.Name)
}
return codec
}
func contentType(subtype string) string {