henrik/followspot-psn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: proper shutdown

Browse Source
This commit is contained in:
Tobias Haugeland
2025-01-10 14:49:02 +01:00
parent 2ae20cdac1
commit 724a423ce8
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
backend/psn_server.py
View File

@@ -3,10 +3,11 @@ import json
import logging import logging
import socket import socket
import time import time
import weakref
from dataclasses import dataclass from dataclasses import dataclass
import psn import psn
from aiohttp import web from aiohttp import web, WSCloseCode
PSN_DEFAULT_UDP_PORT = 56565 PSN_DEFAULT_UDP_PORT = 56565
PSN_DEFAULT_UDP_MCAST_ADDRESS = "236.10.10.10" PSN_DEFAULT_UDP_MCAST_ADDRESS = "236.10.10.10"
@@ -88,18 +89,20 @@ async def handle_websocket(request):
elif msg.type == web.WSMsgType.ERROR: elif msg.type == web.WSMsgType.ERROR:
logging.error("ws connection closed with exception %s" % ws.exception()) logging.error("ws connection closed with exception %s" % ws.exception())
print("ws connection closed with exception %s" % ws.exception())
except Exception as e: except Exception as e:
logging.error(f"Websocket exception: {e}") logging.error(f"Websocket exception: {e}")
finally: finally:
logging.debug("Websocket connection closing") logging.debug("Websocket connection closing")
await ws.close() request.app["ws_clients"].discard(ws)
request.app["ws_clients"].remove(ws)
return ws return ws
async def on_shutdown(app):
for ws in set(app["ws_clients"]):
await ws.close(code=WSCloseCode.GOING_AWAY, message="Server shutdown")
async def handle_root(request): async def handle_root(request):
return web.FileResponse("./static/index.html") return web.FileResponse("./static/index.html")
@@ -133,13 +136,14 @@ def create_app():
app.router.add_static("/", "./static") app.router.add_static("/", "./static")
# Setup app state # Setup app state
app["ws_clients"] = set() app["ws_clients"] = weakref.WeakSet()
app["trackers"] = {} app["trackers"] = {}
app["sock"] = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) app["sock"] = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
for i in range(NUM_TRACKERS): for i in range(NUM_TRACKERS):
app["trackers"][i] = TrackerData(i, 0, 0) app["trackers"][i] = TrackerData(i, 0, 0)
app.on_shutdown.append(on_shutdown)
app.cleanup_ctx.append(background_tasks) app.cleanup_ctx.append(background_tasks)
return app return app