From 256c6567fdfb6368ea1a023d8304d090187e98e5 Mon Sep 17 00:00:00 2001 From: Zedifus Date: Wed, 1 Jun 2022 18:28:24 +0100 Subject: [PATCH] Remove temporary directory on backup completion When running backups, the temporary directory wasn't being properly removed. Added logic to remove the temporary directory upon backup completion, cleaned up the try/except a bit. --- app/classes/shared/server.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 96ce4935..8510d481 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -877,7 +877,6 @@ class Server: os.remove(Helpers.get_os_understandable_path(oldfile_path)) self.is_backingup = False - FileHelpers.del_dirs(temp_dir) logger.info(f"Backup of server: {self.name} completed") self.server_scheduler.remove_job("backup_" + str(self.server_id)) results = {"percent": 100, "total_files": 0, "current_file": 0} @@ -900,7 +899,6 @@ class Server: ).format(self.name), ) time.sleep(3) - return except: logger.exception( f"Failed to create backup of server {self.name} (ID {self.server_id})" @@ -915,7 +913,10 @@ class Server: results, ) self.is_backingup = False - return + finally: + print(temp_dir) + FileHelpers.del_dirs(temp_dir) + return def backup_status(self, source_path, dest_path): results = Helpers.calc_percent(source_path, dest_path)