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

Alert webhook AFTER backup has finished

Browse Source
This commit is contained in:
amcmanu3 2024-03-07 11:06:39 -05:00
parent d778bd36f0
commit 0cd3acca13
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,7 +208,7 @@ class ServerInstance:
self.dir_scheduler.start() self.dir_scheduler.start()
self.start_dir_calc_task() self.start_dir_calc_task()
self.backup_thread = threading.Thread( self.backup_thread = threading.Thread(
target=self.a_backup_server, daemon=True, name=f"backup_{self.name}" target=self.backup_server, daemon=True, name=f"backup_{self.name}"
) )
self.is_backingup = False self.is_backingup = False
# Reset crash and update at initialization # Reset crash and update at initialization
@ -1110,13 +1110,12 @@ class ServerInstance:
f.write("eula=true") f.write("eula=true")
self.run_threaded_server(user_id) self.run_threaded_server(user_id)
@callback def a_backup_server(self):
def backup_server(self):
if self.settings["backup_path"] == "": if self.settings["backup_path"] == "":
logger.critical("Backup path is None. Canceling Backup!") logger.critical("Backup path is None. Canceling Backup!")
return return
backup_thread = threading.Thread( backup_thread = threading.Thread(
target=self.a_backup_server, daemon=True, name=f"backup_{self.name}" target=self.backup_server, daemon=True, name=f"backup_{self.name}"
) )
logger.info( logger.info(
f"Starting Backup Thread for server {self.settings['server_name']}." f"Starting Backup Thread for server {self.settings['server_name']}."
@ -1143,7 +1142,8 @@ class ServerInstance:
return False return False
logger.info(f"Backup Thread started for server {self.settings['server_name']}.") logger.info(f"Backup Thread started for server {self.settings['server_name']}.")
def a_backup_server(self): @callback
def backup_server(self):
was_server_running = None was_server_running = None
logger.info(f"Starting server {self.name} (ID {self.server_id}) backup") logger.info(f"Starting server {self.name} (ID {self.server_id}) backup")
server_users = PermissionsServers.get_server_user_list(self.server_id) server_users = PermissionsServers.get_server_user_list(self.server_id)
@ -1373,7 +1373,7 @@ class ServerInstance:
def a_jar_update(self): def a_jar_update(self):
server_users = PermissionsServers.get_server_user_list(self.server_id) server_users = PermissionsServers.get_server_user_list(self.server_id)
was_started = "-1" was_started = "-1"
self.backup_server() self.a_backup_server()
# checks if server is running. Calls shutdown if it is running. # checks if server is running. Calls shutdown if it is running.
if self.check_running(): if self.check_running():
was_started = True was_started = True

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

@ -140,7 +140,7 @@ class TasksManager:
) )
elif command == "backup_server": elif command == "backup_server":
svr.backup_server() svr.a_backup_server()
elif command == "update_executable": elif command == "update_executable":
svr.jar_update() svr.jar_update()