radio95/RadioPlayer
0
1
Fork 0
mirror of https://github.com/radio95-rnt/RadioPlayer.git synced 2026-02-26 21:53:54 +01:00
Code Issues Activity

shutdown

Browse Source
This commit is contained in:
KubaPro010
2025-12-13 19:07:42 +01:00
parent f0d9e78c98
commit d921670513
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/web.py
View File

@@ -1,4 +1,5 @@
import multiprocessing, os import multiprocessing, os
from multiprocessing.synchronize import Event
import json import json
import threading, uuid, time import threading, uuid, time
import asyncio import asyncio
@@ -99,13 +100,18 @@ async def _safe_send(ws, payload: str, clients: set):
try: clients.discard(ws) try: clients.discard(ws)
except Exception: pass except Exception: pass
def websocket_server_process(shared_data: dict, imc_q: multiprocessing.Queue, ws_q: multiprocessing.Queue): def websocket_server_process(shared_data: dict, imc_q: multiprocessing.Queue, ws_q: multiprocessing.Queue, shutdown_evt: Event):
""" """
Entrypoint for the separate process that runs the asyncio-based websocket server. Entrypoint for the separate process that runs the asyncio-based websocket server.
""" """
# create the asyncio loop and run server # create the asyncio loop and run server
async def runner(): async def runner():
clients = set() clients = set()
stop_evt = asyncio.Event()
async def shutdown_watcher():
await loop.run_in_executor(None, shutdown_evt.wait)
stop_evt.set()
async def handler_wrapper(websocket: ServerConnection): async def handler_wrapper(websocket: ServerConnection):
# register client # register client
@@ -133,9 +139,13 @@ def websocket_server_process(shared_data: dict, imc_q: multiprocessing.Queue, ws
# start server # start server
server = await websockets.serve(handler_wrapper, "0.0.0.0", 3001, server_header="RadioPlayer ws plugin", process_request=process_request) server = await websockets.serve(handler_wrapper, "0.0.0.0", 3001, server_header="RadioPlayer ws plugin", process_request=process_request)
broadcaster = asyncio.create_task(broadcast_worker(ws_q, clients)) broadcaster = asyncio.create_task(broadcast_worker(ws_q, clients))
watcher = asyncio.create_task(shutdown_watcher())
await stop_evt.wait()
server.close()
await server.wait_closed() await server.wait_closed()
ws_q.put(None) ws_q.put(None)
await broadcaster await broadcaster
await watcher
loop = asyncio.new_event_loop() loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop) asyncio.set_event_loop(loop)
@@ -149,8 +159,8 @@ class Module(PlayerModule):
def __init__(self): def __init__(self):
self.manager = multiprocessing.Manager() self.manager = multiprocessing.Manager()
self.data = self.manager.dict() self.data = self.manager.dict()
self.imc_q = self.manager.Queue() self.imc_q = multiprocessing.Queue()
self.ws_q = self.manager.Queue() self.ws_q = multiprocessing.Queue()
self.data["playlist"] = "[]" self.data["playlist"] = "[]"
self.data["track"] = "{}" self.data["track"] = "{}"
@@ -160,6 +170,7 @@ class Module(PlayerModule):
self.ipc_thread = threading.Thread(target=self._ipc_worker, daemon=True) self.ipc_thread = threading.Thread(target=self._ipc_worker, daemon=True)
self.ipc_thread.start() self.ipc_thread.start()
self.shutdown_evt = multiprocessing.Event()
self.ws_process = multiprocessing.Process(target=websocket_server_process, args=(self.data, self.imc_q, self.ws_q), daemon=False) self.ws_process = multiprocessing.Process(target=websocket_server_process, args=(self.data, self.imc_q, self.ws_q), daemon=False)
self.ws_process.start() self.ws_process.start()
if os.name == "posix": if os.name == "posix":
@@ -214,19 +225,18 @@ class Module(PlayerModule):
def shutdown(self): def shutdown(self):
self.ipc_thread_running = False self.ipc_thread_running = False
try: self.imc_q.put(None) self.imc_q.put(None)
except Exception: pass
self.ipc_thread.join(timeout=2) self.ipc_thread.join(timeout=2)
try: self.ws_q.put(None) self.shutdown_evt.set()
except Exception: pass
self.ws_process.join(timeout=3)
if self.ws_process.is_alive(): if self.ws_process.is_alive():
self.ws_process.terminate() self.ws_process.terminate()
self.ws_process.join(timeout=2) self.ws_process.join(timeout=2)
while self.ws_process.is_alive(): if self.ws_process.is_alive():
try: self.ws_process.kill() self.ws_process.kill()
except Exception: pass
module = Module() module = Module()