Skip to content

wsbroadcastserver: use removeClient in removeAll for consistent cleanup #3858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

wsbroadcastserver: use removeClient in removeAll for consistent cleanup #3858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions wsbroadcastserver/clientmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,11 @@ func (cm *ClientManager) registerClient(ctx context.Context, clientConnection *C

// removeAll removes all clients after main ClientManager thread exits
func (cm *ClientManager) removeAll() {
// Only called after main ClientManager thread exits, so remove client directly
for client := range cm.clientPtrMap {
cm.removeClientImpl(client)
}
// Only called after main ClientManager thread exits. Use removeClient to ensure
// connectionLimiter is released and clientPtrMap is cleaned consistently.
for client := range cm.clientPtrMap {
cm.removeClient(client)
}
}

func (cm *ClientManager) removeClientImpl(clientConnection *ClientConnection) {
Expand Down