Add error header
This commit is contained in:
parent
4adc31e62d
commit
5aeb28dfee
@ -3,6 +3,8 @@ package client
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
errs "errors"
|
errs "errors"
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
"github.com/micro/go-micro/codec"
|
"github.com/micro/go-micro/codec"
|
||||||
"github.com/micro/go-micro/codec/json"
|
"github.com/micro/go-micro/codec/json"
|
||||||
@ -112,6 +114,7 @@ func (c *rpcCodec) WriteRequest(req *request, body interface{}) error {
|
|||||||
Method: req.ServiceMethod,
|
Method: req.ServiceMethod,
|
||||||
Type: codec.Request,
|
Type: codec.Request,
|
||||||
Header: map[string]string{
|
Header: map[string]string{
|
||||||
|
"X-Micro-Id": fmt.Sprintf("%d", req.Seq),
|
||||||
"X-Micro-Service": req.Service,
|
"X-Micro-Service": req.Service,
|
||||||
"X-Micro-Method": req.ServiceMethod,
|
"X-Micro-Method": req.ServiceMethod,
|
||||||
},
|
},
|
||||||
@ -147,6 +150,21 @@ func (c *rpcCodec) ReadResponse(r *response, b interface{}) error {
|
|||||||
r.Seq = me.Id
|
r.Seq = me.Id
|
||||||
r.Error = me.Error
|
r.Error = me.Error
|
||||||
|
|
||||||
|
// check error in header
|
||||||
|
if len(me.Error) == 0 {
|
||||||
|
r.Error = me.Header["X-Micro-Error"]
|
||||||
|
}
|
||||||
|
|
||||||
|
// check method in header
|
||||||
|
if len(me.Method) == 0 {
|
||||||
|
r.ServiceMethod = me.Header["X-Micro-Method"]
|
||||||
|
}
|
||||||
|
|
||||||
|
if me.Id == 0 && len(me.Header["X-Micro-Id"]) > 0 {
|
||||||
|
id, _ := strconv.ParseInt(me.Header["X-Micro-Id"], 10, 64)
|
||||||
|
r.Seq = uint64(id)
|
||||||
|
}
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return errors.InternalServerError("go.micro.client.codec", err.Error())
|
return errors.InternalServerError("go.micro.client.codec", err.Error())
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,8 @@ package server
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
|
||||||
"github.com/micro/go-micro/codec"
|
"github.com/micro/go-micro/codec"
|
||||||
"github.com/micro/go-micro/codec/grpc"
|
"github.com/micro/go-micro/codec/grpc"
|
||||||
@ -87,9 +89,17 @@ func (c *rpcCodec) ReadRequestHeader(r *request, first bool) error {
|
|||||||
m.Target = m.Header["X-Micro-Service"]
|
m.Target = m.Header["X-Micro-Service"]
|
||||||
m.Method = m.Header["X-Micro-Method"]
|
m.Method = m.Header["X-Micro-Method"]
|
||||||
|
|
||||||
|
// set id
|
||||||
|
if len(m.Header["X-Micro-Id"]) > 0 {
|
||||||
|
id, _ := strconv.ParseInt(m.Header["X-Micro-Id"], 10, 64)
|
||||||
|
m.Id = uint64(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
// read header via codec
|
||||||
err := c.codec.ReadHeader(&m, codec.Request)
|
err := c.codec.ReadHeader(&m, codec.Request)
|
||||||
r.ServiceMethod = m.Method
|
r.ServiceMethod = m.Method
|
||||||
r.Seq = m.Id
|
r.Seq = m.Id
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -104,11 +114,16 @@ func (c *rpcCodec) WriteResponse(r *response, body interface{}, last bool) error
|
|||||||
Id: r.Seq,
|
Id: r.Seq,
|
||||||
Error: r.Error,
|
Error: r.Error,
|
||||||
Type: codec.Response,
|
Type: codec.Response,
|
||||||
Header: map[string]string{},
|
Header: map[string]string{
|
||||||
|
"X-Micro-Id": fmt.Sprintf("%d", r.Seq),
|
||||||
|
"X-Micro-Method": r.ServiceMethod,
|
||||||
|
"X-Micro-Error": r.Error,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
if err := c.codec.Write(m, body); err != nil {
|
if err := c.codec.Write(m, body); err != nil {
|
||||||
c.buf.wbuf.Reset()
|
c.buf.wbuf.Reset()
|
||||||
m.Error = errors.Wrapf(err, "Unable to encode body").Error()
|
m.Error = errors.Wrapf(err, "Unable to encode body").Error()
|
||||||
|
m.Header["X-Micro-Error"] = m.Error
|
||||||
if err := c.codec.Write(m, nil); err != nil {
|
if err := c.codec.Write(m, nil); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user