Skip to content

Commit 35031cb

Browse files
committed
bug fix: backup schedule
1 parent af182ad commit 35031cb

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

backup/backupManager.py

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -655,13 +655,13 @@ def submitBackupSchedule(self, userID = None, data = None):
655655
return HttpResponse(final_json)
656656
else:
657657
if backupDest == "Home" and backupFreq == "Daily":
658-
cronJob = "0 3 * * * root python /usr/local/CyberCP/plogical/backupScheduleLocal.py"
658+
cronJob = "0 3 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupScheduleLocal.py"
659659
elif backupDest == "Home" and backupFreq == "Weekly":
660-
cronJob = "0 0 * * 0 root python /usr/local/CyberCP/plogical/backupScheduleLocal.py "
660+
cronJob = "0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupScheduleLocal.py "
661661
elif backupDest != "Home" and backupFreq == "Daily":
662-
cronJob = "0 3 * * * root python /usr/local/CyberCP/plogical/backupSchedule.py"
662+
cronJob = "0 3 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupSchedule.py"
663663
elif backupDest != "Home" and backupFreq == "Weekly":
664-
cronJob = "0 0 * * 0 root python /usr/local/CyberCP/plogical/backupSchedule.py "
664+
cronJob = "0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupSchedule.py "
665665

666666
command = "cat " + path
667667
output = ProcessUtilities.outputExecutioner(command)
@@ -684,9 +684,10 @@ def submitBackupSchedule(self, userID = None, data = None):
684684

685685
## Set local path for backup
686686

687-
writeToFile = open(BackupManager.localBackupPath, 'w')
688-
writeToFile.write(data['localPath'])
689-
writeToFile.close()
687+
if backupDest == "Home":
688+
writeToFile = open(BackupManager.localBackupPath, 'w')
689+
writeToFile.write(data['localPath'])
690+
writeToFile.close()
690691

691692
destination = dest.objects.get(destLoc=backupDest)
692693
newSchedule = backupSchedules(dest=destination, frequency=backupFreq)
@@ -696,13 +697,13 @@ def submitBackupSchedule(self, userID = None, data = None):
696697
return HttpResponse(final_json)
697698
except:
698699
if backupDest == "Home" and backupFreq == "Daily":
699-
cronJob = "0 3 * * * root python /usr/local/CyberCP/plogical/backupScheduleLocal.py"
700+
cronJob = "0 3 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupScheduleLocal.py"
700701
elif backupDest == "Home" and backupFreq == "Weekly":
701-
cronJob = "0 0 * * 0 root python /usr/local/CyberCP/plogical/backupScheduleLocal.py "
702+
cronJob = "0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupScheduleLocal.py "
702703
elif backupDest != "Home" and backupFreq == "Daily":
703-
cronJob = "0 3 * * * root python /usr/local/CyberCP/plogical/backupSchedule.py"
704+
cronJob = "0 3 * * * root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupSchedule.py"
704705
elif backupDest != "Home" and backupFreq == "Weekly":
705-
cronJob = "0 0 * * 0 root python /usr/local/CyberCP/plogical/backupSchedule.py "
706+
cronJob = "0 0 * * 0 root /usr/local/CyberCP/bin/python2 /usr/local/CyberCP/plogical/backupSchedule.py "
706707

707708
command = "cat " + path
708709
output = ProcessUtilities.outputExecutioner(command)
@@ -729,9 +730,10 @@ def submitBackupSchedule(self, userID = None, data = None):
729730

730731
## Set local path for backup
731732

732-
writeToFile = open(BackupManager.localBackupPath, 'w')
733-
writeToFile.write(data['localPath'])
734-
writeToFile.close()
733+
if backupDest == "Home":
734+
writeToFile = open(BackupManager.localBackupPath, 'w')
735+
writeToFile.write(data['localPath'])
736+
writeToFile.close()
735737

736738
final_json = json.dumps({'scheduleStatus': 1, 'error_message': "None"})
737739
return HttpResponse(final_json)

0 commit comments

Comments
 (0)