opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #797 from iamqizhao/race-fix

Browse Source 
refactor GracefulStop a bit
This commit is contained in:
Qi Zhao
2016-07-29 11:20:30 -07:00
committed by GitHub
parent 3f4822b67e 0f3fc4355d
commit 45649cd32d
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server.go
View File

@ -797,8 +797,8 @@ func (s *Server) Stop() {
// connections and RPCs and blocks until all the pending RPCs are finished. // connections and RPCs and blocks until all the pending RPCs are finished.
func (s *Server) GracefulStop() { func (s *Server) GracefulStop() {
s.mu.Lock() s.mu.Lock()
defer s.mu.Unlock()
if s.drain == true || s.conns == nil { if s.drain == true || s.conns == nil {
s.mu.Unlock()
return return
} }
s.drain = true s.drain = true
@ -817,7 +817,6 @@ func (s *Server) GracefulStop() {
s.events.Finish() s.events.Finish()
s.events = nil s.events = nil
} }
s.mu.Unlock()
} }
func init() { func init() {