Skip to content

Fix WebSocket send after client disconnect #2318

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

Fix WebSocket send after client disconnect #2318

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
59 changes: 31 additions & 28 deletions deploy/docker/monitor_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,41 +369,44 @@ async def websocket_endpoint(websocket: WebSocket):

try:
while True:
try:
# Gather all monitoring data
monitor = get_monitor()

data = {
"timestamp": asyncio.get_event_loop().time(),
"health": await monitor.get_health_summary(),
"requests": {
"active": monitor.get_active_requests(),
"completed": monitor.get_completed_requests(limit=10)
},
"browsers": await monitor.get_browser_list(),
"timeline": {
"memory": monitor.get_timeline_data("memory", "5m"),
"requests": monitor.get_timeline_data("requests", "5m"),
"browsers": monitor.get_timeline_data("browsers", "5m")
},
"janitor": monitor.get_janitor_log(limit=10),
"errors": monitor.get_errors_log(limit=10)
}

# Send update to client
await websocket.send_json(data)
# Gather all monitoring data
monitor = get_monitor()

# Wait 2 seconds before next update
await asyncio.sleep(2)
data = {
"timestamp": asyncio.get_event_loop().time(),
"health": await monitor.get_health_summary(),
"requests": {
"active": monitor.get_active_requests(),
"completed": monitor.get_completed_requests(limit=10)
},
"browsers": await monitor.get_browser_list(),
"timeline": {
"memory": monitor.get_timeline_data("memory", "5m"),
"requests": monitor.get_timeline_data("requests", "5m"),
"browsers": monitor.get_timeline_data("browsers", "5m")
},
"janitor": monitor.get_janitor_log(limit=10),
"errors": monitor.get_errors_log(limit=10)
}

try:
await websocket.send_json(data)
except WebSocketDisconnect:
logger.info("WebSocket client disconnected")
break
except Exception as e:
logger.error(f"WebSocket error: {e}", exc_info=True)
await asyncio.sleep(2) # Continue trying
except RuntimeError as e:
if "websocket.close" in str(e):
logger.info("WebSocket already closed")
break
raise

await asyncio.sleep(2)

except WebSocketDisconnect:
logger.info("WebSocket client disconnected")

except Exception as e:
logger.error(f"WebSocket connection error: {e}", exc_info=True)

finally:
logger.info("WebSocket connection closed")