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

use final_counter from EOF websocket in UI

Browse Source
This commit is contained in:
Jake McDermott 2018-06-08 23:30:12 -04:00
parent 60a38a196a
commit 992bc1a5ec
No known key found for this signature in database
GPG Key ID: 3B02CAD476EECB35
3 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/features/output/index.controller.js
View File

@ -163,6 +163,11 @@ function startListening () {
listeners.push($scope.$on(resource.ws.events, (scope, data) => handleJobEvent(data)));
listeners.push($scope.$on(resource.ws.status, (scope, data) => handleStatusEvent(data)));
if (resource.model.get('type') === 'job') return;
if (resource.model.get('type') === 'project_update') return;
listeners.push($scope.$on(resource.ws.summary, (scope, data) => handleSummaryEvent(data)));
}
function handleStatusEvent (data) {
@ -174,6 +179,13 @@ function handleJobEvent (data) {
status.pushJobEvent(data);
}
function handleSummaryEvent (data) {
if (resource.model.get('id') !== data.unified_job_id) return;
if (!data.final_counter) return;
stream.setFinalCounter(data.final_counter);
}
function OutputIndexController (
_$compile_,
_$q_,

1
awx/ui/client/features/output/index.js
View File

@ -106,6 +106,7 @@ function resolveResource (
ws: {
events: `${WS_PREFIX}-${key}-${id}`,
status: `${WS_PREFIX}-${name}`,
summary: `${WS_PREFIX}-${name}-summary`,
},
page: {
cache: PAGE_CACHE,

36
awx/ui/client/features/output/stream.service.js
View File

@ -14,10 +14,10 @@ function OutputStream ($q) {
this.counters = {
used: [],
ready: [],
min: 1,
max: 0,
last: null,
ready: false,
final: null,
};
this.state = {
@ -81,16 +81,14 @@ function OutputStream ($q) {
if (maxReady) {
minReady = this.counters.min;
this.counters.ready = true;
this.counters.min = maxReady + 1;
this.counters.used = this.counters.used.filter(c => c > maxReady);
} else {
this.counters.ready = false;
}
this.counters.missing = missing;
this.counters.ready = [minReady, maxReady];
return [minReady, maxReady];
return this.counters.ready;
};
this.pushJobEvent = data => {
@ -100,7 +98,7 @@ function OutputStream ($q) {
.then(() => {
if (data.event === JOB_END) {
this.state.ending = true;
this.counters.last = data.counter;
this.counters.final = data.counter;
}
const [minReady, maxReady] = this.updateCounterState(data);
@ -117,7 +115,7 @@ function OutputStream ($q) {
return $q.resolve();
}
const isLastFrame = this.state.ending && (maxReady >= this.counters.last);
const isLastFrame = this.state.ending && (maxReady >= this.counters.final);
const events = this.hooks.bufferEmpty(minReady, maxReady);
return this.emitFrames(events, isLastFrame);
@ -127,6 +125,27 @@ function OutputStream ($q) {
return this.chain;
};
this.setFinalCounter = counter => {
this.chain = this.chain
.then(() => {
this.state.ending = true;
this.counters.final = counter;
if (counter >= this.counters.min) {
return $q.resolve();
}
let events = [];
if (this.counters.ready.length > 0) {
events = this.hooks.bufferEmpty(...this.counters.ready);
}
return this.emitFrames(events, true);
});
return this.chain;
};
this.emitFrames = (events, last) => this.hooks.onFrames(events)
.then(() => {
if (last) {
@ -136,6 +155,7 @@ function OutputStream ($q) {
this.hooks.onStop();
}
this.counters.ready.length = 0;
return $q.resolve();
});
}