From 0b0dcb4fa23ae9026b28ddb968d872ada5676a6b Mon Sep 17 00:00:00 2001 From: ZKWolf <34097612+wolfswolke@users.noreply.github.com> Date: Wed, 19 Jun 2024 17:32:24 +0200 Subject: [PATCH] Moved logging endpoints to logging.py and added GAMESTATE for boot/dedicated server --- src/endpoints/general.py | 42 ---------------------------------------- src/endpoints/logging.py | 20 +++++++++++++++++++ 2 files changed, 20 insertions(+), 42 deletions(-) diff --git a/src/endpoints/general.py b/src/endpoints/general.py index 871cac3..30fd0f5 100644 --- a/src/endpoints/general.py +++ b/src/endpoints/general.py @@ -89,48 +89,6 @@ def content_version_latest(version): logger.graylog_logger(level="error", handler="general-content-version", message=e) -@app.route("/gameservers.dev", methods=["POST", "GET"]) -def gameservers_dev(): - check_for_game_client("strict") - - try: - # logger.graylog_logger(level="info", handler="logging_gameservers-dev", message=request.get_json()) - return jsonify({"status": "success"}) - except TimeoutError: - return jsonify({"status": "error"}) - except Exception as e: - logger.graylog_logger(level="error", handler="general-gameserver-dev", message=e) - - -@app.route("/gameservers.uat", methods=["POST"]) -def gameservers_uat(): - check_for_game_client("strict") - - try: - # graylog_logger(request.get_json(), "warning") - return jsonify({"status": "success"}) - except TimeoutError: - return jsonify({"status": "error"}) - except Exception as e: - logger.graylog_logger(level="error", handler="general-gameserver-dev", message=e) - return jsonify({"status": "error"}) - - -@app.route("/gameservers.live", methods=["POST", "GET"]) -def gameservers_live(): - check_for_game_client("strict") - - try: - data = message = request.get_json() - # graylog_logger(request.get_json(), "warning") - logger.graylog_logger(level="info", handler="gameserver-live", message=data) - return jsonify({"status": "success"}) - except TimeoutError: - return jsonify({"status": "error"}) - except Exception as e: - logger.graylog_logger(level="error", handler="general-gameserver-dev", message=e) - - @app.route("/api/v1/config/UseMirrorsMM_Steam", methods=["GET"]) # What is this even??? Maybe Use Matchmaking? Its only in old Versions tho... def config_use_mirrors_mm_steam(): diff --git a/src/endpoints/logging.py b/src/endpoints/logging.py index 2309e01..fbb8e40 100644 --- a/src/endpoints/logging.py +++ b/src/endpoints/logging.py @@ -90,6 +90,8 @@ def me_rich_presence(): session_cookie = request.cookies.get("bhvrSession") session_manager.extend_session(session_cookie) user_id = session_manager.get_user_id(session_cookie) + if "gameState" not in request.get_json(): + request.get_json()["gameState"] = "BOOT" try: rich_presence_handler.update_presence(user_id, request.get_json()["userType"], request.get_json()["gameState"]) @@ -125,3 +127,21 @@ def crashreporter_check_report(): return jsonify({"status": "error"}) except Exception as e: logger.graylog_logger(level="error", handler="logging_crashreporter_CheckReport", message=e) + + +@app.route("/gameservers.dev", methods=["POST", "GET"]) +def gameservers_dev(): + check_for_game_client("strict") + return "", 204 + + +@app.route("/gameservers.uat", methods=["POST"]) +def gameservers_uat(): + check_for_game_client("strict") + return "", 204 + + +@app.route("/gameservers.live", methods=["POST", "GET"]) +def gameservers_live(): + check_for_game_client("strict") + return "", 204