bug fix: remove leftover if backup failed

usmannasir · Sep 11, 2020 · 6e076aa · 6e076aa
1 parent 2ce35a3
commit 6e076aa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/plogical/IncScheduler.py b/plogical/IncScheduler.py
@@ -249,7 +249,7 @@ def runGoogleDriveBackups(type):
                         ## Create CyberPanel Folder
 
                         file_metadata = {
-                            'name': 'CyberPanel-%s' % (ipAddress),
+                            'name': '%s-%s' % (items.name, ipAddress),
                             'mimeType': 'application/vnd.google-apps.folder'
                         }
                         file = drive.files().create(body=file_metadata,

diff --git a/plogical/backupSchedule.py b/plogical/backupSchedule.py
@@ -126,6 +126,9 @@ def createLocalBackup(virtualHost, backupLogPath):
                                 command = 'sudo rm -f ' + pid
                                 ProcessUtilities.normalExecutioner(command)
 
+                                command = 'rm -rf %s' % (tempStoragePath)
+                                ProcessUtilities.normalExecutioner(command)
+
                                 backupObs = Backups.objects.filter(fileName=fileName)
                                 for items in backupObs:
                                     items.delete()
@@ -187,6 +190,10 @@ def createLocalBackup(virtualHost, backupLogPath):
                             return 0, 'Backup process killed.'
                     else:
                         if killCounter == 1:
+
+                            command = 'rm -rf %s' % (tempStoragePath)
+                            ProcessUtilities.normalExecutioner(command)
+
                             return 0, 'Backup process killed without reporting any error. [184]'
                         elif os.path.exists(schedulerPath):
                             backupSchedule.remoteBackupLogging(backupLogPath, 'Backup process killed. Error: %s' % (