#705 wait all inflight requests

smallnest · Mar 22, 2022 · 742b7da · 742b7da
1 parent 3c4d76f
commit 742b7da
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/server/server.go b/server/server.go
@@ -245,14 +245,11 @@ func (s *Server) serveListener(ln net.Listener) error {
 	for {
 		conn, e := ln.Accept()
 		if e != nil {
-			select {
-			case <-s.getDoneChan():
+			if s.isShutdown() {
+				<-s.doneChan
 				return ErrServerClosed
-			default:
 			}
 
-			<-s.doneChan
-
 			if ne, ok := e.(net.Error); ok && ne.Temporary() {
 				if tempDelay == 0 {
 					tempDelay = 5 * time.Millisecond