Leahnaya/DeathGarden_API_Rebirth
0
0
Fork 0
mirror of https://github.com/wolfswolke/DeathGarden_API_Rebirth.git synced 2026-04-19 05:27:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed LOGGING message=str(e) to message=e cause else it wont log.

Browse Source
This commit is contained in:
ZKWolf 2023-07-02 21:01:10 +02:00
parent f305d3d25d
commit 0ba74ef49a
5 changed files with 64 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/endpoints/logging.py
View File

@ -12,7 +12,7 @@ def get_quitter_state():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_getQuitterState", message=str(e))
logger.graylog_logger(level="error", handler="logging_getQuitterState", message=e)
@app.route("/metrics/client/event", methods=["POST"])
@ -27,7 +27,7 @@ def receive_event():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_client_Event", message=str(e))
logger.graylog_logger(level="error", handler="logging_client_Event", message=e)
@app.route("/metrics/httplog/event", methods=["POST"])
@ -41,7 +41,7 @@ def metrics_httplog_event():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_httplog_Event", message=str(e))
logger.graylog_logger(level="error", handler="logging_httplog_Event", message=e)
@app.route("/api/v1/gameDataAnalytics", methods=["POST"])
@ -56,7 +56,7 @@ def analytics_post():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_gameDataAnalytics", message=str(e))
logger.graylog_logger(level="error", handler="logging_gameDataAnalytics", message=e)
@app.route("/api/v1/gameDataAnalytics/batch", methods=["POST"])
@ -71,7 +71,7 @@ def analytics_batch_post():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_gameDataAnalyticsBatch", message=str(e))
logger.graylog_logger(level="error", handler="logging_gameDataAnalyticsBatch", message=e)
@app.route("/api/v1/me/richPresence", methods=["POST"])
@ -85,7 +85,7 @@ def me_rich_presence():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_meRichPresence", message=str(e))
logger.graylog_logger(level="error", handler="logging_meRichPresence", message=e)
@app.route("/metrics/server/event", methods=["POST"])
@ -99,7 +99,7 @@ def metrics_server_event():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_server_Event", message=str(e))
logger.graylog_logger(level="error", handler="logging_server_Event", message=e)
@app.route("/crashreport/unreal/CrashReporter/CheckReport", methods=["POST"])
@ -113,7 +113,7 @@ def crashreporter_check_report():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_crashreporter_CheckReport", message=str(e))
logger.graylog_logger(level="error", handler="logging_crashreporter_CheckReport", message=e)
@app.route("/metrics/matchmaking/event", methods=["POST"])
@ -127,7 +127,7 @@ def metrics_matchmaking_event():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_matchmaking_Event", message=str(e))
logger.graylog_logger(level="error", handler="logging_matchmaking_Event", message=e)
@app.route("/api/v1/extensions/challenges/getChallengeProgressionBatch", methods=["POST"])
@ -142,4 +142,4 @@ def challenges_get_challenge_progression_batch():
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_getChallengeProgressionBatch", message=str(e))
logger.graylog_logger(level="error", handler="logging_getChallengeProgressionBatch", message=e)

6
src/endpoints/matchmaking.py
View File

@ -15,7 +15,7 @@ def match_making_regions_raw():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
print(e)
logger.graylog_logger(level="error", handler="matchmaking_RegionsRAW", message=e)
@app.route("/api/v1/queue/info", methods=["GET"])
@ -123,10 +123,10 @@ def progression_player_end_of_match():
get_remote_ip()
try:
print("Responded to progression player end of match api call POST")
logger.graylog_logger(level="info", handler="logging_playerEndOfMatch", message=request.get_json())
logger.graylog_logger(level="info", handler="matchmaking_playerEndOfMatch", message=request.get_json())
return jsonify({"status": "success"})
except TimeoutError:
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_playerEndOfMatch", message=e)
logger.graylog_logger(level="error", handler="matchmaking_playerEndOfMatch", message=e)

2
src/endpoints/unknown.py
View File

@ -14,7 +14,7 @@ def catalog_get(game_version):
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
print(e)
logger.graylog_logger(level="error", handler="catalog", message=e)
@app.errorhandler(404)

36
src/endpoints/user_handeling.py
View File

@ -41,7 +41,7 @@ def steam_login_function():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="steam_login", message=str(e))
logger.graylog_logger(level="error", handler="steam_login", message=e)
# This works
@ -69,7 +69,7 @@ def steam_login():
return_val.set_cookie("bhvrSession", return_val.json["id"])
return return_val
except Exception as e:
logger.graylog_logger(level="error", handler="steam_login", message=str(e))
logger.graylog_logger(level="error", handler="steam_login", message=e)
abort(401, "Unauthorized")
elif user_agent.startswith("game=TheExit, engine=UE4, version="):
@ -94,7 +94,7 @@ def modifiers():
except TimeoutError:
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="modifiers_me", message=str(e))
logger.graylog_logger(level="error", handler="modifiers_me", message=e)
# This works
@ -114,7 +114,7 @@ def moderation_check_username():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="moderation_check_username", message=str(e))
logger.graylog_logger(level="error", handler="moderation_check_username", message=e)
# Doesn't work
@ -142,7 +142,7 @@ def progression_experience():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="progression_experience", message=str(e))
logger.graylog_logger(level="error", handler="progression_experience", message=e)
# idk dont think it works
@ -191,7 +191,7 @@ def challenges_execute_challenge_progression_operation_batch():
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_executeChallengeProgressionOperationBatch",
message=str(e))
message=e)
# idk dont think it works
@ -243,7 +243,7 @@ def inventories():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="inventories", message=str(e))
logger.graylog_logger(level="error", handler="inventories", message=e)
# idk if this works
@ -268,7 +268,7 @@ def progression_groups():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="ProgressionGroups", message=str(e))
logger.graylog_logger(level="error", handler="ProgressionGroups", message=e)
# This works
@ -318,7 +318,7 @@ def get_ban_info():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="ban_status", message=str(e))
logger.graylog_logger(level="error", handler="ban_status", message=e)
# This works
@ -344,7 +344,7 @@ def wallet_currencies():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="currencies", message=str(e))
logger.graylog_logger(level="error", handler="currencies", message=e)
# Does not work. Old DG endpoint. Not needed.
@ -358,7 +358,7 @@ def wallet_currencies_progression():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="currencies", message=str(e))
logger.graylog_logger(level="error", handler="currencies", message=e)
# Dont know if this works. Dont think it does.
@ -381,7 +381,7 @@ def achievements_get():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="Achievment_handler", message=str(e))
logger.graylog_logger(level="error", handler="Achievment_handler", message=e)
# Does not work
@ -394,7 +394,7 @@ def messages_count():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="messages_count", message=str(e))
logger.graylog_logger(level="error", handler="messages_count", message=e)
@app.route("/api/v1/messages/list", methods=["GET"])
@ -408,7 +408,7 @@ def messages_list():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="messages_list", message=str(e))
logger.graylog_logger(level="error", handler="messages_list", message=e)
# Temp response.
@ -426,7 +426,7 @@ def moderation_check_chat():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="moderation_check_chat", message=str(e))
logger.graylog_logger(level="error", handler="moderation_check_chat", message=e)
# Dont know if this works. Dont think it does.
@ -468,7 +468,7 @@ def extension_progression_init_or_get_groups():
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="logging_initOrGetGroups", message=str(e))
logger.graylog_logger(level="error", handler="logging_initOrGetGroups", message=e)
# dont know if this works. Hope it does.
@ -478,9 +478,9 @@ def inventory_unlock_special_items():
try:
print("Responded to Inventory Unlock Special Items event api call POST")
logger.graylog_logger(level="info", handler="unknown_unlockSpecialItems", message=request.get_json())
return jsonify({"UnlockedItems": ["RN_SAWBONES_Fullset_OR002_Item", "Runner.Sawbones", "Runner.Sawbones.Fullset"]})
return jsonify({"UnlockedItems": ["9F54DE7A-4E15935B-503850A1-27B0A2A4"]})
except TimeoutError:
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
logger.graylog_logger(level="error", handler="unknown_unlockSpecialItems", message=str(e))
logger.graylog_logger(level="error", handler="unknown_unlockSpecialItems", message=e)

61
src/endpoints/web.py
View File

@ -51,34 +51,37 @@ def debug_user(steamid):
@app.route("/debug/mirrors", methods=["POST", "GET"])
def debug_mirrors_write():
get_remote_ip()
if request.method == "POST":
try:
api_token = request.cookies.get("api_token")
if api_token is None:
return jsonify({"status": "error", "message": "No api token found"}, 401)
else:
if api_token in allowed_tokens:
steam_user_id = request.json.get("steamid")
data_b = request.json.get("data")
if data_b or steam_user_id:
return_val = mongo.write_data_with_list(steamid=steam_user_id, items_dict=data_b, server=mongo_host, db=mongo_db,
collection=mongo_collection)
if return_val == None:
return jsonify({"status": "error", "message": "Error."}, 400)
else:
return jsonify({"status": "success", "message": "Data written."}, 200)
else:
return jsonify({"status": "error", "message": "No data or Steamid found."}, 400)
try:
if request.method == "POST":
try:
api_token = request.cookies.get("api_token")
if api_token is None:
return jsonify({"status": "error", "message": "No api token found"}, 401)
else:
return jsonify({"status": "error", "message": "Invalid api token"}, 401)
if api_token in allowed_tokens:
except TimeoutError:
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
print(e)
logger.graylog_logger(level="error", handler="logging_debug_mirror_write", message=e)
if request.method == "GET":
return jsonify({"message": "Endpoint not found"}), 404
steam_user_id = request.json.get("steamid")
data_b = request.json.get("data")
if data_b or steam_user_id:
return_val = mongo.write_data_with_list(steamid=steam_user_id, items_dict=data_b, server=mongo_host, db=mongo_db,
collection=mongo_collection)
if return_val == None:
return jsonify({"status": "error", "message": "Error."}, 400)
else:
return jsonify({"status": "success", "message": "Data written."}, 200)
else:
return jsonify({"status": "error", "message": "No data or Steamid found."}, 400)
else:
return jsonify({"status": "error", "message": "Invalid api token"}, 401)
except TimeoutError:
print("Timeout error")
return jsonify({"status": "error"})
except Exception as e:
print(e)
logger.graylog_logger(level="error", handler="logging_debug_mirror_write", message=e)
if request.method == "GET":
return jsonify({"message": "Endpoint not found"}), 404
except Exception as e:
logger.graylog_logger(level="error", handler="web_debug_mirrors", message=e)