Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2025-07-25 02:55:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix backup logic

Browse Source
This commit is contained in:
Andrew
2022-09-03 13:23:30 -04:00
parent 6559112e1b
commit 5d688522bd
1 changed files with 66 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1108,6 +1108,21 @@ class ServerInstance:
except FileNotFoundError: except FileNotFoundError:
logger.error("Could not create backup of jarfile. File not found.") logger.error("Could not create backup of jarfile. File not found.")
# wait for backup
while self.is_backingup:
time.sleep(10)
# check if backup was successful
if self.last_backup_failed:
server_users = PermissionsServers.get_server_user_list(self.server_id)
for user in server_users:
self.helper.websocket_helper.broadcast_user(
user,
"notification",
"Backup failed for " + self.name + ". canceling update.",
)
# 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(
@ -1141,39 +1156,13 @@ class ServerInstance:
f"Failed to download bedrock executable for update \n{e}" f"Failed to download bedrock executable for update \n{e}"
) )
while self.stats_helper.get_server_stats()["updating"]: if downloaded:
if downloaded and not self.is_backingup: logger.info("Executable updated successfully. Starting Server")
logger.info("Executable updated successfully. Starting Server")
self.stats_helper.set_update(False) self.stats_helper.set_update(False)
if len(self.helper.websocket_helper.clients) > 0: if len(self.helper.websocket_helper.clients) > 0:
# There are clients # There are clients
self.check_update() self.check_update()
server_users = PermissionsServers.get_server_user_list(
self.server_id
)
for user in server_users:
self.helper.websocket_helper.broadcast_user(
user,
"notification",
"Executable update finished for " + self.name,
)
time.sleep(3)
self.helper.websocket_helper.broadcast_page(
"/panel/server_detail",
"update_button_status",
{
"isUpdating": self.check_update(),
"server_id": self.server_id,
"wasRunning": was_started,
},
)
self.helper.websocket_helper.broadcast_page(
"/panel/dashboard", "send_start_reload", {}
)
self.helper.websocket_helper.broadcast_page(
"/panel/server_detail", "remove_spinner", {}
)
server_users = PermissionsServers.get_server_user_list(self.server_id) server_users = PermissionsServers.get_server_user_list(self.server_id)
for user in server_users: for user in server_users:
self.helper.websocket_helper.broadcast_user( self.helper.websocket_helper.broadcast_user(
@ -1181,29 +1170,52 @@ class ServerInstance:
"notification", "notification",
"Executable update finished for " + self.name, "Executable update finished for " + self.name,
) )
time.sleep(3)
self.management_helper.add_to_audit_log_raw( self.helper.websocket_helper.broadcast_page(
"Alert", "/panel/server_detail",
"-1", "update_button_status",
self.server_id, {
"Executable update finished for " + self.name, "isUpdating": self.check_update(),
self.settings["server_ip"], "server_id": self.server_id,
"wasRunning": was_started,
},
) )
if was_started: self.helper.websocket_helper.broadcast_page(
self.start_server() "/panel/dashboard", "send_start_reload", {}
elif not downloaded and not self.is_backingup: )
time.sleep(5) self.helper.websocket_helper.broadcast_page(
server_users = PermissionsServers.get_server_user_list(self.server_id) "/panel/server_detail", "remove_spinner", {}
for user in server_users: )
self.helper.websocket_helper.broadcast_user( server_users = PermissionsServers.get_server_user_list(self.server_id)
user, for user in server_users:
"notification", self.helper.websocket_helper.broadcast_user(
"Executable update failed for " user,
+ self.name "notification",
+ ". Check log file for details.", "Executable update finished for " + self.name,
) )
logger.error("Executable download failed.")
self.stats_helper.set_update(False) self.management_helper.add_to_audit_log_raw(
"Alert",
"-1",
self.server_id,
"Executable update finished for " + self.name,
self.settings["server_ip"],
)
if was_started:
self.start_server()
else:
time.sleep(5)
server_users = PermissionsServers.get_server_user_list(self.server_id)
for user in server_users:
self.helper.websocket_helper.broadcast_user(
user,
"notification",
"Executable update failed for "
+ self.name
+ ". Check log file for details.",
)
logger.error("Executable download failed.")
self.stats_helper.set_update(False)
# ********************************************************************************** # **********************************************************************************
# Minecraft Servers Statistics # Minecraft Servers Statistics