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

add some logging to contine killed job

Browse Source
This commit is contained in:
Usman Nasir
2020-09-29 12:32:36 +05:00
parent c7d9d9ea43
commit eab90e87b7
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backup/static/backup/backup.js
View File

@@ -1585,6 +1585,7 @@ app.controller('scheduleBackup', function ($scope, $http, $window) {
$scope.fetchJobs = function () {
$scope.cyberPanelLoading = false;
$scope.jobsHidden = true;
var config = {
headers: {
@@ -1642,7 +1643,7 @@ app.controller('scheduleBackup', function ($scope, $http, $window) {
}
};
var data = {
selectedAccount: $scope.selectedAccount,
selectedAccount: $scope.selectedAccountAdd,
name: $scope.name,
backupFrequency: $scope.backupFrequency
};

2
backup/templates/backup/backupSchedule.html
View File

@@ -34,7 +34,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Select Destination" %}</label>
<div class="col-sm-6">
<select ng-model="selectedAccount" class="form-control">
<select ng-model="selectedAccountAdd" class="form-control">
{% for items in destinations %}
<option>{{ items }}</option>
{% endfor %}

19
plogical/IncScheduler.py
View File

@@ -369,6 +369,7 @@ class IncScheduler():
if destinationConfig['type'] == 'local':
finalPath = '%s/%s' % (destinationConfig['path'].rstrip('/'), currentTime)
command = 'mkdir -p %s' % (finalPath)
ProcessUtilities.executioner(command)
@@ -381,7 +382,7 @@ class IncScheduler():
pid = jobConfig['pid']
stuckDomain = jobConfig['website']
finalPath = jobConfig['finalPath']
jobConfig['pid'] = os.getpid()
jobConfig['pid'] = str(os.getpid())
command = 'ps aux'
result = ProcessUtilities.outputExecutioner(command)
@@ -422,6 +423,8 @@ class IncScheduler():
## Save currently backing domain in db, so that i can restart from here when prematurely killed
jobConfig['website'] = domain
jobConfig[IncScheduler.lastRun] = time.strftime("%d %b %Y, %I:%M %p")
jobConfig[IncScheduler.currentStatus] = 'Running..'
backupjob.config = json.dumps(jobConfig)
backupjob.save()
@@ -466,6 +469,7 @@ Automatic backup failed for %s on %s.
jobConfig = json.loads(backupjob.config)
if jobConfig['pid']:
del jobConfig['pid']
jobConfig[IncScheduler.currentStatus] = 'Not running'
backupjob.config = json.dumps(jobConfig)
backupjob.save()
else:
@@ -483,7 +487,7 @@ Automatic backup failed for %s on %s.
pid = jobConfig['pid']
stuckDomain = jobConfig['website']
finalPath = jobConfig['finalPath']
jobConfig['pid'] = os.getpid()
jobConfig['pid'] = str(os.getpid())
command = 'ps aux'
result = ProcessUtilities.outputExecutioner(command)
@@ -503,6 +507,9 @@ Automatic backup failed for %s on %s.
message='Starting %s backup on %s..' % (
type, time.strftime("%m.%d.%Y_%H-%M-%S"))).save()
if oldJobContinue:
NormalBackupJobLogs(owner=backupjob, status=backupSchedule.INFO, message='Will continue old killed job starting from %s.' % (stuckDomain)).save()
actualDomain = 0
try:
if jobConfig[IncScheduler.allSites] == 'all':
@@ -525,6 +532,8 @@ Automatic backup failed for %s on %s.
## Save currently backing domain in db, so that i can restart from here when prematurely killed
jobConfig['website'] = domain
jobConfig[IncScheduler.lastRun] = time.strftime("%d %b %Y, %I:%M %p")
jobConfig[IncScheduler.currentStatus] = 'Running..'
backupjob.config = json.dumps(jobConfig)
backupjob.save()
@@ -562,6 +571,11 @@ Automatic backup failed for %s on %s.
command = "scp -o StrictHostKeyChecking=no -P " + destinationConfig['port'] + " -i /root/.ssh/cyberpanel " + backupPath + " " + destinationConfig['username'] + "@" + destinationConfig['ip'] + ":%s" % (finalPath)
ProcessUtilities.executioner(command)
try:
os.remove(backupPath)
except:
pass
NormalBackupJobLogs(owner=backupjob, status=backupSchedule.INFO,
message='Backup completed for %s on %s.' % (
domain, time.strftime("%m.%d.%Y_%H-%M-%S"))).save()
@@ -569,6 +583,7 @@ Automatic backup failed for %s on %s.
jobConfig = json.loads(backupjob.config)
if jobConfig['pid']:
del jobConfig['pid']
jobConfig[IncScheduler.currentStatus] = 'Not running'
backupjob.config = json.dumps(jobConfig)
backupjob.save()