Improve stream processing

This commit is contained in:
Asim Aslam 2019-08-25 19:30:22 +01:00
parent 6128d18ee0
commit 36623bfe50
3 changed files with 41 additions and 28 deletions

View File

@ -94,6 +94,17 @@ func (c *Codec) Write(m *codec.Message, b interface{}) error {
m.Header[":status"] = "200" m.Header[":status"] = "200"
m.Header["grpc-status"] = "0" m.Header["grpc-status"] = "0"
// m.Header["grpc-message"] = "" // m.Header["grpc-message"] = ""
case codec.Error:
m.Header["Trailer"] = "grpc-status, grpc-message"
// micro end of stream
if m.Error == "EOS" {
m.Header["grpc-status"] = "0"
} else {
m.Header["grpc-message"] = m.Error
m.Header["grpc-status"] = "13"
}
return nil
} }
// marshal content // marshal content

View File

@ -154,34 +154,6 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
sockets[id] = psock sockets[id] = psock
mtx.Unlock() mtx.Unlock()
// wait for processing to exit
wg.Add(1)
// process the outbound messages from the socket
go func(id string, psock *socket.Socket) {
defer func() {
wg.Done()
}()
for {
// get the message from our internal handler/stream
m := new(transport.Message)
if err := psock.Process(m); err != nil {
// delete the socket
mtx.Lock()
delete(sockets, id)
mtx.Unlock()
return
}
// send the message back over the socket
if err := sock.Send(m); err != nil {
return
}
}
}(id, psock)
// now walk the usual path // now walk the usual path
// we use this Timeout header to set a server deadline // we use this Timeout header to set a server deadline
@ -287,6 +259,33 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
r = rpcRouter{handler} r = rpcRouter{handler}
} }
// wait for processing to exit
wg.Add(1)
// process the outbound messages from the socket
go func(id string, psock *socket.Socket) {
defer func() {
wg.Done()
}()
for {
// get the message from our internal handler/stream
m := new(transport.Message)
if err := psock.Process(m); err != nil {
// delete the socket
mtx.Lock()
delete(sockets, id)
mtx.Unlock()
return
}
// send the message back over the socket
if err := sock.Send(m); err != nil {
return
}
}
}(id, psock)
// serve the request in a go routine as this may be a stream // serve the request in a go routine as this may be a stream
go func(id string, psock *socket.Socket) { go func(id string, psock *socket.Socket) {
defer psock.Close() defer psock.Close()

View File

@ -324,6 +324,9 @@ func (h *httpTransportSocket) Send(m *Message) error {
// write request // write request
_, err := h.w.Write(m.Body) _, err := h.w.Write(m.Body)
// flush the trailers
h.w.(http.Flusher).Flush()
return err return err
} }