1
0
mirror of https://github.com/go-micro/go-micro.git synced 2025-06-18 22:17:44 +02:00

use send/recv semantics

This commit is contained in:
Asim
2015-05-21 21:08:19 +01:00
parent 4f909d0be4
commit c9df1cf7d2
8 changed files with 166 additions and 168 deletions

View File

@ -26,10 +26,10 @@ var (
RpcPath = "/_rpc"
)
func (s *RpcServer) serve(sock transport.Socket) {
func (s *RpcServer) accept(sock transport.Socket) {
// serveCtx := getServerContext(req)
msg, err := sock.Recv()
if err != nil {
var msg transport.Message
if err := sock.Recv(&msg); err != nil {
return
}
@ -55,13 +55,16 @@ func (s *RpcServer) serve(sock transport.Socket) {
}
//ctx := newContext(&ctx{}, serveCtx)
err = s.rpc.ServeRequestWithContext(context.Background(), cc)
if err != nil {
if err := s.rpc.ServeRequestWithContext(context.Background(), cc); err != nil {
return
}
sock.WriteHeader("Content-Type", msg.Header["Content-Type"])
sock.Write(rsp.Bytes())
sock.Send(&transport.Message{
Header: map[string]string{
"Content-Type": msg.Header["Content-Type"],
},
Body: rsp.Bytes(),
})
}
func (s *RpcServer) Address() string {
@ -96,7 +99,7 @@ func (s *RpcServer) Register(r Receiver) error {
func (s *RpcServer) Start() error {
registerHealthChecker(http.DefaultServeMux)
ts, err := s.opts.transport.NewServer(s.address)
ts, err := s.opts.transport.Listen(s.address)
if err != nil {
return err
}
@ -107,7 +110,7 @@ func (s *RpcServer) Start() error {
s.address = ts.Addr()
s.mtx.RUnlock()
go ts.Serve(s.serve)
go ts.Accept(s.accept)
go func() {
ch := <-s.exit