ash/BAPSicle
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make stop and restart more reliable, fix server config form.

Browse source
This commit is contained in:
Matthew Stratford 2021-04-18 21:18:20 +01:00
parent 34220d1765
commit 44494f8e60
2 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
player_handler.py
View file

@ -4,6 +4,7 @@ from time import sleep
from os import _exit from os import _exit
from helpers.logging_manager import LoggingManager from helpers.logging_manager import LoggingManager
from helpers.the_terminator import Terminator
class PlayerHandler: class PlayerHandler:
@ -12,12 +13,13 @@ class PlayerHandler:
def __init__(self, channel_from_q, websocket_to_q, ui_to_q, controller_to_q): def __init__(self, channel_from_q, websocket_to_q, ui_to_q, controller_to_q):
self.logger = LoggingManager("PlayerHandler") self.logger = LoggingManager("PlayerHandler")
process_title = "PlayerHandler" process_title = "Player Handler"
setproctitle(process_title) setproctitle(process_title)
current_process().name = process_title current_process().name = process_title
terminator = Terminator()
try: try:
while True: while not terminator.terminate:
for channel in range(len(channel_from_q)): for channel in range(len(channel_from_q)):
try: try:
@ -36,11 +38,6 @@ class PlayerHandler:
pass pass
sleep(0.02) sleep(0.02)
# Catch the handler being killed externally.
except KeyboardInterrupt:
self.logger.log.info("Received KeyboardInterupt")
except SystemExit:
self.logger.log.info("Received SystemExit")
except Exception as e: except Exception as e:
self.logger.log.exception( self.logger.log.exception(
"Received unexpected exception: {}".format(e)) "Received unexpected exception: {}".format(e))

36
web_server.py
View file

@ -104,21 +104,21 @@ def ui_config_server(request):
@app.route("/config/server/update", methods=["POST"]) @app.route("/config/server/update", methods=["POST"])
def ui_config_server_update(request): def ui_config_server_update(request):
server_state.update("server_name", request.form["name"]) server_state.update("server_name", request.form.get("name"))
server_state.update("host", request.form["host"]) server_state.update("host", request.form.get("host"))
server_state.update("port", int(request.form["port"])) server_state.update("port", int(request.form.get("port")))
server_state.update("num_channels", int(request.form["channels"])) server_state.update("num_channels", int(request.form.get("channels")))
server_state.update("ws_port", int(request.form["ws_port"])) server_state.update("ws_port", int(request.form.get("ws_port")))
server_state.update("serial_port", request.form["serial_port"]) server_state.update("serial_port", request.form.get("serial_port"))
# Because we're not showing the api key once it's set. # Because we're not showing the api key once it's set.
if "myradio_api_key" in request.form and request.form["myradio_api_key"] != "": if "myradio_api_key" in request.form and request.form.get("myradio_api_key") != "":
server_state.update("myradio_api_key", request.form["myradio_api_key"]) server_state.update("myradio_api_key", request.form.get("myradio_api_key"))
server_state.update("myradio_base_url", request.form["myradio_base_url"]) server_state.update("myradio_base_url", request.form.get("myradio_base_url"))
server_state.update("myradio_api_url", request.form["myradio_api_url"]) server_state.update("myradio_api_url", request.form.get("myradio_api_url"))
# stopServer()
return ui_config_server(request) return redirect("/restart")
@app.route("/logs") @app.route("/logs")
@ -221,7 +221,7 @@ def player_all_stop(request):
# Show Plan Functions # Show Plan Functions
@app.route("/plan/load/<int:timeslotid>") @app.route("/plan/load/<timeslotid:int>")
def plan_load(request, timeslotid: int): def plan_load(request, timeslotid: int):
for channel in player_to_q: for channel in player_to_q:
@ -361,12 +361,6 @@ def WebServer(player_to: List[Queue], player_from: List[Queue], state: StateMana
setproctitle(process_title) setproctitle(process_title)
CORS(app, supports_credentials=True) # Allow ALL CORS!!! CORS(app, supports_credentials=True) # Allow ALL CORS!!!
# if not isBundelled():
# log = logging.getLogger("werkzeug")
# log.disabled = True
#app.logger.disabled = True
terminate = Terminator() terminate = Terminator()
while not terminate.terminate: while not terminate.terminate:
try: try:
@ -374,11 +368,7 @@ def WebServer(player_to: List[Queue], player_from: List[Queue], state: StateMana
host=server_state.get()["host"], host=server_state.get()["host"],
port=server_state.get()["port"], port=server_state.get()["port"],
debug=True, debug=True,
# workers=10,
auto_reload=False auto_reload=False
# use_reloader=False,
# threaded=False # While API handles are singlethreaded.
)) ))
sleep(1) sleep(1)
except Exception: except Exception: