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

Merge pull request #1918 from jakemcdermott/job-results/fix-status-check

Browse Source 
improve status checking for job results
This commit is contained in:
Jake McDermott
2018-05-22 16:40:55 -04:00
committed by GitHub
parent 156b5e6979 34dc939782
commit 845227a9c4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/features/output/status.service.js
View File

@@ -151,12 +151,11 @@ function JobStatusService (moment, message) {
}; };
this.setJobStatus = status => { this.setJobStatus = status => {
this.state.status = status; const isExpectingStats = this.isExpectingStatsEvent();
const isIncomplete = _.includes(INCOMPLETE, status); const isIncomplete = _.includes(INCOMPLETE, status);
const isFinished = _.includes(FINISHED, status); const isFinished = _.includes(FINISHED, status);
if ((this.isExpectingStatsEvent() && isIncomplete) || isFinished) { if ((isExpectingStats && isIncomplete) || (!isExpectingStats && isFinished)) {
if (this.latestTime) { if (this.latestTime) {
this.setFinished(this.latestTime); this.setFinished(this.latestTime);
if (!this.state.started && this.state.elapsed) { if (!this.state.started && this.state.elapsed) {
@@ -166,6 +165,7 @@ function JobStatusService (moment, message) {
} }
} }
this.state.status = status;
this.updateRunningState(); this.updateRunningState();
}; };