unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

Fix rpc codec issue stopping json requests from working

Browse Source
This commit is contained in:
Asim 2015-10-15 22:06:43 +01:00
parent 6ab6e9725d
commit 0adc0e3c00
1 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
server/rpc_codec.go
View File

@ -3,7 +3,6 @@ package server
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/myodc/go-micro/transport" "github.com/myodc/go-micro/transport"
rpc "github.com/youtube/vitess/go/rpcplus" rpc "github.com/youtube/vitess/go/rpcplus"
js "github.com/youtube/vitess/go/rpcplus/jsonrpc" js "github.com/youtube/vitess/go/rpcplus/jsonrpc"
@ -15,34 +14,52 @@ type rpcPlusCodec struct {
codec rpc.ServerCodec codec rpc.ServerCodec
req *transport.Message req *transport.Message
buf *readWriteCloser
}
type readWriteCloser struct {
wbuf *bytes.Buffer wbuf *bytes.Buffer
rbuf *bytes.Buffer rbuf *bytes.Buffer
} }
func newRpcPlusCodec(req *transport.Message, socket transport.Socket) *rpcPlusCodec { func (rwc *readWriteCloser) Read(p []byte) (n int, err error) {
return &rpcPlusCodec{ return rwc.rbuf.Read(p)
socket: socket, }
req: req,
wbuf: bytes.NewBuffer(nil), func (rwc *readWriteCloser) Write(p []byte) (n int, err error) {
rbuf: bytes.NewBuffer(nil), return rwc.wbuf.Write(p)
}
func (rwc *readWriteCloser) Close() error {
rwc.rbuf.Reset()
rwc.wbuf.Reset()
return nil
}
func newRpcPlusCodec(req *transport.Message, socket transport.Socket) rpc.ServerCodec {
r := &rpcPlusCodec{
socket: socket,
req: req,
buf: &readWriteCloser{
rbuf: bytes.NewBuffer(req.Body),
wbuf: bytes.NewBuffer(nil),
},
}
switch req.Header["Content-Type"] {
case "application/octet-stream":
r.codec = pb.NewServerCodec(r.buf)
case "application/json":
r.codec = js.NewServerCodec(r.buf)
} }
return r
} }
func (c *rpcPlusCodec) ReadRequestHeader(r *rpc.Request) error { func (c *rpcPlusCodec) ReadRequestHeader(r *rpc.Request) error {
c.rbuf.Reset() if c.codec == nil {
c.rbuf.Write(c.req.Body)
buf := &buffer{c.rbuf}
switch c.req.Header["Content-Type"] {
case "application/octet-stream":
c.codec = pb.NewServerCodec(buf)
case "application/json":
c.codec = js.NewServerCodec(buf)
default:
return fmt.Errorf("unsupported content type %s", c.req.Header["Content-Type"]) return fmt.Errorf("unsupported content type %s", c.req.Header["Content-Type"])
} }
return c.codec.ReadRequestHeader(r) return c.codec.ReadRequestHeader(r)
} }
@ -51,32 +68,22 @@ func (c *rpcPlusCodec) ReadRequestBody(r interface{}) error {
} }
func (c *rpcPlusCodec) WriteResponse(r *rpc.Response, body interface{}, last bool) error { func (c *rpcPlusCodec) WriteResponse(r *rpc.Response, body interface{}, last bool) error {
c.wbuf.Reset() if c.codec == nil {
buf := &buffer{c.wbuf}
var cc rpc.ServerCodec
switch c.req.Header["Content-Type"] {
case "application/octet-stream":
cc = pb.NewServerCodec(buf)
case "application/json":
cc = js.NewServerCodec(buf)
default:
return fmt.Errorf("unsupported request type: %s", c.req.Header["Content-Type"]) return fmt.Errorf("unsupported request type: %s", c.req.Header["Content-Type"])
} }
c.buf.wbuf.Reset()
if err := cc.WriteResponse(r, body, last); err != nil { if err := c.codec.WriteResponse(r, body, last); err != nil {
return err return err
} }
return c.socket.Send(&transport.Message{ return c.socket.Send(&transport.Message{
Header: map[string]string{"Content-Type": c.req.Header["Content-Type"]}, Header: map[string]string{"Content-Type": c.req.Header["Content-Type"]},
Body: c.wbuf.Bytes(), Body: c.buf.wbuf.Bytes(),
}) })
} }
func (c *rpcPlusCodec) Close() error { func (c *rpcPlusCodec) Close() error {
c.wbuf.Reset() c.buf.Close()
c.rbuf.Reset()
return c.socket.Close() return c.socket.Close()
} }