External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-16 20:30:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactor

Browse Source 
Latest iteration on event queue processing. Replaced setTimeout with an interval.
This commit is contained in:
Chris Houseknecht 2014-06-19 03:34:07 -04:00 committed by Luke Sneeringer
parent 3a6fe9ee4a
commit 69add3d626
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/app.js
View File

@ -470,6 +470,10 @@ angular.module('Tower', [
HideStream();
}
if ($rootScope.jobDetailInterval) {
window.clearInterval($rootScope.jobDetailInterval);
}
// On each navigation request, check that the user is logged in
if (!/^\/(login|logout)/.test($location.path())) {
// capture most recent URL, excluding login/logout

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

@ -45,6 +45,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
scope.searchSummaryHostsEnabled = true;
scope.searchAllHostsEnabled = true;
scope.haltEventQueue = false;
scope.processing = false;
scope.host_summary = {};
scope.host_summary.ok = 0;
@ -69,13 +70,14 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
event_socket.on("job_events-" + job_id, function(data) {
data.event = data.event_name;
if (api_complete && data.id > lastEventId) {
if (queue.length < 20) {
if (queue.length < 25) {
$log.debug('received event: ' + data.id);
queue.unshift(data);
}
else {
api_complete = false; // stop more events from hitting the queue
window.clearInterval($rootScope.jobDetailInterval);
$log.debug('queue halted. reloading...');
$log.debug('halting queue. reloading...');
setTimeout(function() {
$log.debug('reload');
scope.haltEventQueue = true;
@ -99,6 +101,7 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
$log.debug('Job completed!');
api_complete = false;
scope.haltEventQueue = true;
window.clearInterval($rootScope.jobDetailInterval);
queue = [];
scope.$emit('LoadJob');
}
@ -124,7 +127,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
playId = (scope.plays.length > 0) ? scope.plays[scope.plays.length - 1].id : 0;
lastEventId = Math.max(hostId, taskId, playId);
api_complete = true;
Wait('stop');
// Draw the graph
@ -147,16 +149,18 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log,
msg: 'Call to ' + url + '. GET returned: ' + status });
});
}
else if (scope.host_summary.total > 0) {
// Draw the graph based on summary values in memory
DrawGraph({ scope: scope, resize: true });
else {
if (scope.host_summary.total > 0) {
// Draw the graph based on summary values in memory
DrawGraph({ scope: scope, resize: true });
}
api_complete = true;
scope.haltEventQueue = false;
ProcessEventQueue({
scope: scope,
eventQueue: queue
});
}
ProcessEventQueue({
scope: scope,
eventQueue: queue
});
});
if (scope.removeInitialDataLoaded) {

16
awx/ui/static/js/helpers/JobDetail.js
View File

@ -42,25 +42,21 @@ angular.module('JobDetailHelper', ['Utilities', 'RestServices'])
.factory('ProcessEventQueue', ['$log', '$rootScope', 'DigestEvent', 'JobIsFinished', function ($log, $rootScope, DigestEvent, JobIsFinished) {
return function(params) {
var scope = params.scope,
eventQueue = params.eventQueue,
processing = false;
eventQueue = params.eventQueue;
function runTheQ() {
var event;
processing = true;
scope.processing = true;
while (!JobIsFinished(scope) && !scope.haltEventQueue && eventQueue.length > 0) {
event = eventQueue.pop();
$log.debug('processing event: ' + event.id);
DigestEvent({ scope: scope, event: event });
}
processing = false;
//if (!JobIsFinished(scope) && !scope.haltEventQueue) {
// setTimeout( function() {
// runTheQ();
// }, 1000);
//}
$log.debug('processing halted');
scope.processing = false;
}
$rootScope.jobDetailInterval = window.setInterval(function() {
if (!processing && eventQueue.length > 0) {
$log.debug('checking... processing: ' + scope.processing + ' queue.length: ' + eventQueue.length);
if (!scope.processing && eventQueue.length > 0) {
runTheQ();
}
}, 1000);