Skip to content
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

Single client disconnection #107

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Single client disconnection #107

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c76594
Single client disconnection
Tyris0001 Oct 12, 2022
28018c2
Update websocket_server.py
Tyris0001 Oct 13, 2022
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
33 changes: 33 additions & 0 deletions websocket_server/websocket_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,12 @@ def disconnect_clients_gracefully(self, status=CLOSE_STATUS_NORMAL, reason=DEFAU
def disconnect_clients_abruptly(self):
self._disconnect_clients_abruptly()

def disconnect_client_gracefully(self, client, status=CLOSE_STATUS_NORMAL, reason=DEFAULT_CLOSE_REASON):
self._disconnect_client_gracefully(client, status, reason)

def disconnect_client_abruptly(self, client):
self._disconnect_client_abruptly(client)


class WebsocketServer(ThreadingMixIn, TCPServer, API):
"""
Expand Down Expand Up @@ -247,6 +253,33 @@ def _disconnect_clients_abruptly(self):
"""
self._terminate_client_handlers()

def _disconnect_client_gracefully(self, client, status, reason):
"""
Terminate a client gracefully without shutting down the server
"""
for cl in self.clients:
if cl["id"] == client["id"]:
self._client_left_(client["handler"])
client["handler"].send_close(status, reason)
return

logger.error("Client does not exist/was not found")

def _disconnect_client_abruptly(self, client):
"""
Terminate client abruptly (no CLOSE handshake) without shutting down the server
"""
for cl in self.clients:
if cl["id"] == client["id"]:
self._client_left_(client["handler"])
client["handler"].keep_alive = False
client["handler"].finish()
client["handler"].connection.close()
return

logger.error("Client does not exist/was not found")


def _deny_new_connections(self, status, reason):
self._deny_clients = {
"status": status,
Expand Down