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

bug fix: incremental backups delete

Browse Source
This commit is contained in:
Usman Nasir
2021-05-09 13:39:39 +05:00
parent 618220f7fd
commit 205c684300
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
IncBackups/IncBackupsControl.py
View File

@@ -197,7 +197,7 @@ class IncJobs(multi.Thread):
result = ProcessUtilities.outputExecutioner(command) result = ProcessUtilities.outputExecutioner(command)
if result.find('removed snapshot') == -1: if result.find('removed snapshot') == -1 or result.find('deleted') == -1:
logging.statusWriter(self.statusPath, 'Failed: %s. [5009]' % (result), 1) logging.statusWriter(self.statusPath, 'Failed: %s. [5009]' % (result), 1)
return 0 return 0
@@ -265,7 +265,7 @@ class IncJobs(multi.Thread):
command = 'restic -r %s forget %s --password-file %s' % (repoLocation, self.jobid.snapshotid, self.passwordFile) command = 'restic -r %s forget %s --password-file %s' % (repoLocation, self.jobid.snapshotid, self.passwordFile)
result = ProcessUtilities.outputExecutioner(command) result = ProcessUtilities.outputExecutioner(command)
if result.find('removed snapshot') == -1: if result.find('removed snapshot') == -1 or result.find('deleted') == -1:
logging.statusWriter(self.statusPath, 'Failed: %s. [5009]' % (result), 1) logging.statusWriter(self.statusPath, 'Failed: %s. [5009]' % (result), 1)
return 0 return 0
@@ -322,7 +322,7 @@ class IncJobs(multi.Thread):
command = 'export PATH=${PATH}:/usr/bin && restic -r %s:%s forget %s --password-file %s' % ( command = 'export PATH=${PATH}:/usr/bin && restic -r %s:%s forget %s --password-file %s' % (
self.jobid.destination, repoLocation, self.jobid.snapshotid, self.passwordFile) self.jobid.destination, repoLocation, self.jobid.snapshotid, self.passwordFile)
result = ProcessUtilities.outputExecutioner(command) result = ProcessUtilities.outputExecutioner(command)
if result.find('removed snapshot') == -1: if result.find('removed snapshot') == -1 or result.find('deleted') == -1:
logging.statusWriter(self.statusPath, 'Failed: %s. [5009]' % (result), 1) logging.statusWriter(self.statusPath, 'Failed: %s. [5009]' % (result), 1)
return 0 return 0
@@ -889,14 +889,11 @@ Subject: %s
self.jobid = job_snapshot self.jobid = job_snapshot
if self.jobid.destination == 'local': if self.jobid.destination == 'local':
if self.localFunction('none', 'none', 0, 1) == 0: self.localFunction('none', 'none', 0, 1)
return 0
elif self.jobid.destination[:4] == 'sftp': elif self.jobid.destination[:4] == 'sftp':
if self.sftpFunction('none', 'none', 0, 1) == 0: self.sftpFunction('none', 'none', 0, 1)
return 0
else: else:
if self.awsFunction('restore', '', self.jobid.snapshotid, None, 1) == 0: self.awsFunction('restore', '', self.jobid.snapshotid, None, 1)
return 0
return 1 return 1