From 51caf2a24e64268a690d7e79c40d06d1a70c6050 Mon Sep 17 00:00:00 2001 From: Di Wu Date: Tue, 7 Jul 2020 03:14:22 +0800 Subject: [PATCH] remove global error tracking (#1777) Co-authored-by: Asim Aslam --- server/rpc_server.go | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/server/rpc_server.go b/server/rpc_server.go index 6f30c525..f32eb939 100644 --- a/server/rpc_server.go +++ b/server/rpc_server.go @@ -131,8 +131,6 @@ func (s *rpcServer) HandleEvent(e broker.Event) error { // ServeConn serves a single connection func (s *rpcServer) ServeConn(sock transport.Socket) { - // global error tracking - var gerr error // streams are multiplexed on Micro-Stream or Micro-Id header pool := socket.NewPool() @@ -147,11 +145,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) { } defer func() { - // only wait if there's no error - if gerr == nil { - // wait till done - wg.Wait() - } + // wait till done + wg.Wait() // close all the sockets for this connection pool.Close() @@ -172,10 +167,6 @@ func (s *rpcServer) ServeConn(sock transport.Socket) { var msg transport.Message // process inbound messages one at a time if err := sock.Recv(&msg); err != nil { - // set a global error and return - // we're saying we essentially can't - // use the socket anymore - gerr = err return } @@ -193,7 +184,6 @@ func (s *rpcServer) ServeConn(sock transport.Socket) { if err := sock.Send(&transport.Message{ Header: msg.Header, }); err != nil { - gerr = err break } // we're done @@ -303,14 +293,12 @@ func (s *rpcServer) ServeConn(sock transport.Socket) { // try get a new codec if cf, err = s.newCodec(ct); err != nil { // no codec found so send back an error - if err := sock.Send(&transport.Message{ + sock.Send(&transport.Message{ Header: map[string]string{ "Content-Type": "text/plain", }, Body: []byte(err.Error()), - }); err != nil { - gerr = err - } + }) // release the socket we just created pool.Release(psock)