server: inline waitForServerConnRemoval, finishEventLog

fho · Oct 30, 2023 · 702ac45 · 702ac45
1 parent d976997
commit 702ac45
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/server.go b/server.go
@@ -1885,18 +1885,15 @@ func (s *Server) stop(graceful bool) {
 		s.stopServerWorkers()
 	}
 
-	s.waitForServerConnRemoval()
-	s.finishEventLog()
-}
-
-// waitForServerConnRemoval blocks until s.conns is empty.
-//
-// s.mu must be held by the caller.
-func (s *Server) waitForServerConnRemoval() {
 	for len(s.conns) != 0 {
 		s.cv.Wait()
 	}
 	s.conns = nil
+
+	if s.events != nil {
+		s.events.Finish()
+		s.events = nil
+	}
 }
 
 // s.mu must be held by the caller.
@@ -1920,14 +1917,6 @@ func (s *Server) drainAllServerTransports() {
 	}
 }
 
-// s.mu must be held by the caller.
-func (s *Server) finishEventLog() {
-	if s.events != nil {
-		s.events.Finish()
-		s.events = nil
-	}
-}
-
 // s.mu must be held by the caller.
 func (s *Server) closeListeners() {
 	for lis := range s.lis {