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

Change waitgroup processing

Browse Source
This commit is contained in:
Asim Aslam 2018-05-26 09:41:41 +01:00
parent b4f47b1cc9
commit a56e97b47d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/rpc_server.go
View File

@ -66,6 +66,9 @@ func (s *rpcServer) accept(sock transport.Socket) {
return return
} }
// add to wait group
s.wg.Add(1)
// we use this Timeout header to set a server deadline // we use this Timeout header to set a server deadline
to := msg.Header["Timeout"] to := msg.Header["Timeout"]
// we use this Content-Type header to identify the codec needed // we use this Content-Type header to identify the codec needed
@ -80,6 +83,7 @@ func (s *rpcServer) accept(sock transport.Socket) {
}, },
Body: []byte(err.Error()), Body: []byte(err.Error()),
}) })
s.wg.Done()
return return
} }
@ -102,15 +106,13 @@ func (s *rpcServer) accept(sock transport.Socket) {
} }
} }
// add to wait group
s.wg.Add(1)
defer s.wg.Done()
// TODO: needs better error handling // TODO: needs better error handling
if err := s.rpc.serveRequest(ctx, codec, ct); err != nil { if err := s.rpc.serveRequest(ctx, codec, ct); err != nil {
s.wg.Done()
log.Logf("Unexpected error serving request, closing socket: %v", err) log.Logf("Unexpected error serving request, closing socket: %v", err)
return return
} }
s.wg.Done()
} }
} }