Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-07 13:56:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: add check to see if backup process killed

Browse Source
This commit is contained in:
Usman Nasir
2019-12-13 22:18:53 +05:00
parent 52e7f038f1
commit 08cc518b1a
4 changed files with 76 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plogical/backupSchedule.py
View File

@@ -52,8 +52,12 @@ class backupSchedule:
tempStoragePath = data['tempStorage']
backupSchedule.remoteBackupLogging(backupLogPath, "Waiting for backup to complete.. ")
time.sleep(5)
schedulerPath = '/home/cyberpanel/%s-backup.txt' % (virtualHost)
while (1):
diff = datetime.now() - startingTime
backupDomain = virtualHost
status = os.path.join("/home", backupDomain, "backup/status")
backupFileNamePath = os.path.join("/home", backupDomain, "backup/backupFileName")
@@ -117,6 +121,14 @@ class backupSchedule:
except:
pass
return 0, tempStoragePath
elif os.path.exists(schedulerPath):
os.remove(schedulerPath)
return 0, 'Backup process killed without reporting any error.'
except BaseException, msg:
logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [119:startBackup]")
return 0, str(msg)