Merge branch 'bugfix/backup-webhook' into 'dev'

Alert webhook AFTER backup has finished

See merge request crafty-controller/crafty-4!727

CHANGELOG.md

@@ -13,6 +13,7 @@ TBD
 - Fix Sanitisation on Passwords ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/715) | [Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/725))
 - Fix `Upload Imports` on unix systems, that have a space in the root dir name ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/722))
 - Fix Bedrock downloads, add `www` to download URL ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/723))
+- Fire backup webhook 'after' backup has finished ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/727))
 ### Tweaks
 - Bump pyOpenSSL & cryptography for CVE-2024-0727, CVE-2023-50782 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/716))
 - Bump cryptography for CVE-2024-26130 ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/724))

app/classes/shared/server.py

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

app/classes/shared/tasks.py

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