Skip to content

Task-Scheduler/Instance-Scheduler/Script-Gallery Issue Solution #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2016
Merged

Task-Scheduler/Instance-Scheduler/Script-Gallery Issue Solution #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions ...cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,11 @@
}
$scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString();
$scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency;
$scope.timeEventHour = items.chefJenkScriptTaskObj.timeEventHour || items.chefJenkScriptTaskObj.cronHour !==null? items.chefJenkScriptTaskObj.cronHour.toString() : '';
$scope.timeEventMinute = items.chefJenkScriptTaskObj.timeEventMinute || items.chefJenkScriptTaskObj.cronMinute !==null ? items.chefJenkScriptTaskObj.cronMinute.toString() : '';
$scope.weekOfTheDay = items.chefJenkScriptTaskObj.weekOfTheDay || items.chefJenkScriptTaskObj.cronWeekDay !==null ?items.chefJenkScriptTaskObj.cronWeekDay.toString(): '';
$scope.currentDate = items.chefJenkScriptTaskObj.currentDate || items.chefJenkScriptTaskObj.cronDate !==null ?items.chefJenkScriptTaskObj.cronDate.toString() : '';
$scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth || items.chefJenkScriptTaskObj.cronMonth !==null ?items.chefJenkScriptTaskObj.cronMonth.toString() : '';
$scope.selectedMonth = items.chefJenkScriptTaskObj.selectedMonth || items.chefJenkScriptTaskObj.cronYear !==null ? items.chefJenkScriptTaskObj.cronYear.toString() : '';
$scope.timeEventHour = items.chefJenkScriptTaskObj.timeEventHour || (items.chefJenkScriptTaskObj.cronMinute && items.chefJenkScriptTaskObj.cronMinute !==null) ? items.chefJenkScriptTaskObj.cronHour.toString() : '';
$scope.timeEventMinute = items.chefJenkScriptTaskObj.timeEventMinute || (items.chefJenkScriptTaskObj.cronMinute && items.chefJenkScriptTaskObj.cronMinute !==null) ? items.chefJenkScriptTaskObj.cronMinute.toString() : '';
$scope.weekOfTheDay = items.chefJenkScriptTaskObj.weekOfTheDay || (items.chefJenkScriptTaskObj.cronWeekDay && items.chefJenkScriptTaskObj.cronWeekDay !==null) ?items.chefJenkScriptTaskObj.cronWeekDay.toString(): '';
$scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth || (items.chefJenkScriptTaskObj.cronDate && items.chefJenkScriptTaskObj.cronDate !==null) ?items.chefJenkScriptTaskObj.cronDate.toString() : '';
$scope.selectedMonth = items.chefJenkScriptTaskObj.selectedMonth || (items.chefJenkScriptTaskObj.cronMonth && items.chefJenkScriptTaskObj.cronMonth !==null) ? items.chefJenkScriptTaskObj.cronMonth.toString() : '';
if ($scope.repeatsType === 'Minutes' || $scope.repeatsType === 'Hourly') {
$scope.checkFrequencyCheck = false;
} else {
Expand Down
4 changes: 2 additions & 2 deletions client/htmls/private/js/scriptList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ function setfilename(val){
//calling the global track functionality when track params are available..
$(document).ready(function(e) {
getScriptList();
$('#divParam').hide();
$('#checkScriptParam').hide();
});

//when the user clicks on the new button the setting the value to 'new' for the hidden field to know that user is creating the new item..
Expand All @@ -23,6 +21,8 @@ $('.addScriptItem').click(function(e) {
$('#fileHiddenInputId').val('');
$('.modal-header').find('.modal-title').html('Create New Script Item');
$('#scriptEditHiddenInput').val('new');
$('#divParam').hide();
$('#checkScriptParam').hide();
getOrganizationList();
});

Expand Down
29 changes: 26 additions & 3 deletions server/app/cronjobs/catalyst-scheduler/catalystScheduler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,16 @@ catalystSync.executeScheduledInstances = function executeScheduledInstances() {
var resultList =[];
for (var i = 0; i < instances.length; i++) {
(function(instance) {
if(instance.cronJobIds && instance.cronJobIds !== null){
cronTab.cancelJobIds(instance.cronJobIds);
if(instance.cronJobIds && instance.cronJobIds.length > 0){
var cronJobCheck = cancelOldCronJobs(instance.cronJobIds)
if(cronJobCheck){
resultList.push(function(callback){schedulerService.executeSchedulerForInstances(instance,callback);});
}
}else {
resultList.push(function (callback) {
schedulerService.executeSchedulerForInstances(instance, callback);
});
}
resultList.push(function(callback){schedulerService.executeSchedulerForInstances(instance,callback);});
if(resultList.length === instances.length){
logger.debug("Schedule Instance length for Scheduler Start>>"+resultList.length);
async.parallel(resultList,function(err,results){
Expand Down Expand Up @@ -127,4 +133,21 @@ catalystSync.executeSerialScheduledTasks = function executeSerialScheduledTasks(
return;
}
});
}

function cancelOldCronJobs(ids){
if(ids.length > 0){
var count = 0;
for(var i = 0; i < ids.length; i++){
(function(id){
count++;
cronTab.cancelJob(id);
})(ids[i]);
}
if(count === ids.length){
return true;
}
}else{
return true;
}
}
4 changes: 4 additions & 0 deletions server/app/model/audit-trail/bot-audit-trail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ var BotAuditTrailSchema = new BaseAuditTrail({
type: String,
trim:true
},
manualExecutionTime:{
type: Number,
required: false
},
nodeIdsWithActionLog:[Schema.Types.Mixed]
}
});
Expand Down
1 change: 1 addition & 0 deletions server/app/routes/v1.0/routes_blueprints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
description:blueprint.shortDesc,
category:blueprint.botCategory,
executionType:blueprint.blueprintType,
manualExecutionTime:blueprint.manualExecutionTime,
nodeIdsWithActionLog:[]
};
blueprint.envId= req.query.envId;
Expand Down
4 changes: 3 additions & 1 deletion server/app/routes/v1.0/routes_fileUpload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ module.exports.setRoutes = function(app, sessionVerificationFunc) {
}
res.send({fileId:fileData});
})
} else {
} else if(req.query.fileId !== '' && req.query.fileId !== null) {
res.send({fileId:req.query.fileId});
} else{
res.send({message: "Bad Request"});
}
});
Expand Down
5 changes: 3 additions & 2 deletions server/app/services/auditTrailService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,9 +235,10 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){
for(var i = 0; i < botAuditTrail.length; i++){
(function(auditTrail){
count++;
if(auditTrail.endedOn && auditTrail.endedOn !== null && auditTrail.actionStatus !== 'failed') {
if(auditTrail.endedOn && auditTrail.endedOn !== null && auditTrail.actionStatus !== 'failed'
&& auditTrail.auditTrailConfig.manualExecutionTime && auditTrail.auditTrailConfig.manualExecutionTime !== null) {
var executionTime = getExecutionTime(auditTrail.endedOn, auditTrail.startedOn);
totalTimeInSeconds = totalTimeInSeconds + (600 - executionTime);
totalTimeInSeconds = totalTimeInSeconds + ((auditTrail.auditTrailConfig.manualExecutionTime*60) - executionTime);
}
})(botAuditTrail[i]);
}
Expand Down
3 changes: 2 additions & 1 deletion server/app/services/taskService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic
var auditTrailId = null;
var taskExecutionCount = 0;
if(task.executionCount){
taskExecutionCount = task.taskExecutionCount + 1
taskExecutionCount = task.executionCount + 1
}else{
taskExecutionCount = 1;
}
Expand All @@ -178,6 +178,7 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic
description:task.shortDesc,
category:task.botCategory,
executionType:task.taskType,
manualExecutionTime:task.manualExecutionTime,
nodeIdsWithActionLog:[]
};
auditTrailService.insertAuditTrail(task,auditTrailObj,actionObj,function(err,data) {
Expand Down