External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-11 03:17:38 -02:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactor

Browse Source 
Fixed issue with tracking last event id.
This commit is contained in:
Chris Houseknecht
2014-06-18 18:48:17 -04:00
committed by Luke Sneeringer
parent 7755cc32e2
commit 88c1f13d27
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/static/js/controllers/JobDetail.js
View File

@@ -68,6 +68,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
event_socket.on("job_events-" + job_id, function(data) { event_socket.on("job_events-" + job_id, function(data) {
data.event = data.event_name; data.event = data.event_name;
console.log("id: " + data.id + " lastEventId: " + lastEventId);
if (api_complete && data.id > lastEventId) { if (api_complete && data.id > lastEventId) {
$log.debug('received event: ' + data.id); $log.debug('received event: ' + data.id);
if (queue.length < 50) { if (queue.length < 50) {
@@ -109,12 +110,17 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
} }
scope.removeAPIComplete = scope.$on('APIComplete', function() { scope.removeAPIComplete = scope.$on('APIComplete', function() {
// process any events sitting in the queue // process any events sitting in the queue
var url, hostId = 0, taskId = 0, playId = 0; var keys, url, hostId = 0, taskId = 0, playId = 0;
// Find the max event.id value in memory // Find the max event.id value in memory
hostId = (scope.hostResults.length > 0) ? scope.hostResults[scope.hostResults.length - 1] : 0; hostId = (scope.hostResults.length > 0) ? scope.hostResults[scope.hostResults.length - 1].id : 0;
taskId = (scope.tasks.length > 0) ? scope.tasks[scope.tasks.length - 1] : 0; if (scope.hostResults.length > 0) {
playId = (scope.plays.length > 0) ? scope.plays[scope.plays.length - 1] : 0; keys = Object.keys(scope.hostResults);
keys.sort();
hostId = keys[keys.length - 1];
}
taskId = (scope.tasks.length > 0) ? scope.tasks[scope.tasks.length - 1].id : 0;
playId = (scope.plays.length > 0) ? scope.plays[scope.plays.length - 1].id : 0;
lastEventId = Math.max(hostId, taskId, playId); lastEventId = Math.max(hostId, taskId, playId);
api_complete = true; api_complete = true;