Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert steam_cmd server type to steamcmd

Browse Source 
Need for backups and valve server query
This commit is contained in:
Zedifus 2024-02-16 18:21:02 +00:00
parent dbea214d6f
commit 185ae4e1a9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/classes/shared/main_controller.py
View File

@ -553,7 +553,7 @@ class Controller:
elif data["monitoring_type"] == "steam_cmd": elif data["monitoring_type"] == "steam_cmd":
monitoring_port = data["steam_cmd_monitoring_data"]["port"] monitoring_port = data["steam_cmd_monitoring_data"]["port"]
monitoring_host = data["steam_cmd_monitoring_data"]["host"] monitoring_host = data["steam_cmd_monitoring_data"]["host"]
monitoring_type = "raknet" monitoring_type = "steam_cmd"
elif data["monitoring_type"] == "none": elif data["monitoring_type"] == "none":
# TODO: this needs to be NUKED.. # TODO: this needs to be NUKED..
# There shouldn't be anything set if there is nothing to monitor # There shouldn't be anything set if there is nothing to monitor

5
app/classes/shared/server.py
View File

@ -541,7 +541,7 @@ class ServerInstance:
# STEAM SERVERS # STEAM SERVERS
# *********************************************** # ***********************************************
# *********************************************** # ***********************************************
elif HelperServers.get_server_type_by_id(self.server_id) == "raknet": elif HelperServers.get_server_type_by_id(self.server_id) == "steam_cmd":
my_env = os.environ my_env = os.environ
env_mod = False env_mod = False
with open( with open(
@ -1522,6 +1522,7 @@ class ServerInstance:
return False return False
# lets download the files # lets download the files
if HelperServers.get_server_type_by_id(self.server_id) != "minecraft-bedrock": if HelperServers.get_server_type_by_id(self.server_id) != "minecraft-bedrock":
# boolean returns true for false for success # boolean returns true for false for success
downloaded = Helpers.download_file( downloaded = Helpers.download_file(
@ -1871,6 +1872,8 @@ class ServerInstance:
int_mc_ping = ping_raknet(internal_ip, int(server_port)) int_mc_ping = ping_raknet(internal_ip, int(server_port))
else: else:
int_mc_ping = ping(internal_ip, int(server_port)) int_mc_ping = ping(internal_ip, int(server_port))
# TODO MAKE BETTER identify based on db server type
# dont hammer servers with unrelated requests to their type
int_data = False int_data = False
ping_data = {} ping_data = {}