Skip to content

fix: connection removal #387

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
xBlaz3kx wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: connection removal #387

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
27 changes: 20 additions & 7 deletions ws/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,15 +316,21 @@ func (s *server) Stop() {
}

func (s *server) StopConnection(id string, closeError websocket.CloseError) error {
s.connMutex.RLock()
s.connMutex.Lock()
defer s.connMutex.Unlock()
w, ok := s.connections[id]
s.connMutex.RUnlock()

if !ok {
return fmt.Errorf("couldn't stop websocket connection. No connection with id %s is open", id)
}

log.Debugf("sending stop signal for websocket %s", w.ID())
return w.Close(closeError)

err := w.Close(closeError)
if err == nil {
delete(s.connections, id)
}

return err
}

func (s *server) GetChannel(websocketId string) (Channel, bool) {
Expand All @@ -335,11 +341,18 @@ func (s *server) GetChannel(websocketId string) (Channel, bool) {
}

func (s *server) stopConnections() {
s.connMutex.RLock()
defer s.connMutex.RUnlock()
s.connMutex.Lock()
defer s.connMutex.Lock()

for _, conn := range s.connections {
_ = conn.Close(websocket.CloseError{Code: websocket.CloseNormalClosure, Text: ""})
err := conn.Close(websocket.CloseError{Code: websocket.CloseNormalClosure, Text: ""})
if err != nil {
log.Error("Unable to close connection for ", conn.id, ": ", err.Error())
}
}

// Reset the connections
s.connections = make(map[string]*webSocket)
}

func (s *server) Write(webSocketId string, data []byte) error {
Expand Down