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

don't try to use stats events for adhoc commands

Browse Source
This commit is contained in:
Jake McDermott
2018-04-05 16:41:34 -05:00
parent 8134110e6f
commit 60d311c1a9
2 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,7 +95,7 @@ function init () {
} }
}); });
$scope.$on(resource.ws.events, handleSocketEvent); $scope.$on(resource.ws.events, handleJobEvent);
$scope.$on(resource.ws.status, handleStatusEvent); $scope.$on(resource.ws.status, handleStatusEvent);
if (!status.isRunning()) { if (!status.isRunning()) {
@@ -107,7 +107,7 @@ function handleStatusEvent (scope, data) {
status.pushStatusEvent(data); status.pushStatusEvent(data);
} }
function handleSocketEvent (scope, data) { function handleJobEvent (scope, data) {
engine.pushJobEvent(data); engine.pushJobEvent(data);
status.pushJobEvent(data); status.pushJobEvent(data);

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

@@ -2,7 +2,9 @@ const JOB_START = 'playbook_on_start';
const JOB_END = 'playbook_on_stats'; const JOB_END = 'playbook_on_stats';
const PLAY_START = 'playbook_on_play_start'; const PLAY_START = 'playbook_on_play_start';
const TASK_START = 'playbook_on_task_start'; const TASK_START = 'playbook_on_task_start';
const HOST_STATUS_KEYS = ['dark', 'failures', 'changed', 'ok', 'skipped']; const HOST_STATUS_KEYS = ['dark', 'failures', 'changed', 'ok', 'skipped'];
const FINISHED = ['running', 'successful', 'failed', 'error'];
let moment; let moment;
@@ -14,6 +16,7 @@ function JobStatusService (_moment_) {
this.created = resource.model.get('created'); this.created = resource.model.get('created');
this.job = resource.model.get('id'); this.job = resource.model.get('id');
this.jobType = resource.model.get('type');
this.project = resource.model.get('project'); this.project = resource.model.get('project');
this.elapsed = resource.model.get('elapsed'); this.elapsed = resource.model.get('elapsed');
this.started = resource.model.get('started'); this.started = resource.model.get('started');
@@ -21,6 +24,7 @@ function JobStatusService (_moment_) {
this.jobStatus = resource.model.get('status'); this.jobStatus = resource.model.get('status');
this.projectStatus = resource.model.get('summary_fields.project_update.status'); this.projectStatus = resource.model.get('summary_fields.project_update.status');
this.latestTime = null;
this.playCount = null; this.playCount = null;
this.taskCount = null; this.taskCount = null;
this.hostCount = null; this.hostCount = null;
@@ -40,6 +44,15 @@ function JobStatusService (_moment_) {
} else if (isProjectEvent) { } else if (isProjectEvent) {
this.setProjectStatus(data.status); this.setProjectStatus(data.status);
} }
if (this.isCommand()) {
if (_.includes(FINISHED, data.status)) {
if (!this.started && this.latestJobEventTime) {
this.started = moment(this.latestJobEventTime)
.subtract(this.elapsed, 'seconds');
}
}
}
}; };
this.pushJobEvent = data => { this.pushJobEvent = data => {
@@ -52,8 +65,8 @@ function JobStatusService (_moment_) {
if (isLatest) { if (isLatest) {
this.counter = data.counter; this.counter = data.counter;
this.latestTime = data.created;
this.elapsed = moment(data.created).diff(this.created, 'seconds'); this.elapsed = moment(data.created).diff(this.created, 'seconds');
this.jobStatus = _.get(data, ['summary_fields', 'job', 'status']);
} }
if (data.event === JOB_START) { if (data.event === JOB_START) {
@@ -97,14 +110,12 @@ function JobStatusService (_moment_) {
}; };
this.updateStats = () => { this.updateStats = () => {
if (!this.statsEvent) {
return;
}
this.updateHostCounts(); this.updateHostCounts();
this.setFinished(this.statsEvent.created); if (this.statsEvent) {
this.setJobStatus(this.statsEvent.failed ? 'failed' : 'successful'); this.setFinished(this.statsEvent.created);
this.setJobStatus(this.statsEvent.failed ? 'failed' : 'successful');
}
}; };
this.isRunning = () => (Boolean(this.started) && !this.finished) || this.isRunning = () => (Boolean(this.started) && !this.finished) ||
@@ -112,6 +123,7 @@ function JobStatusService (_moment_) {
(this.jobStatus === 'pending') || (this.jobStatus === 'pending') ||
(this.jobStatus === 'waiting'); (this.jobStatus === 'waiting');
this.isCommand = () => (this.jobType === 'ad_hoc_command');
this.getPlayCount = () => this.playCount; this.getPlayCount = () => this.playCount;
this.getTaskCount = () => this.taskCount; this.getTaskCount = () => this.taskCount;
this.getHostCount = () => this.hostCount; this.getHostCount = () => this.hostCount;
@@ -125,6 +137,16 @@ function JobStatusService (_moment_) {
this.setJobStatus = status => { this.setJobStatus = status => {
this.jobStatus = status; this.jobStatus = status;
if (this.isCommand() && _.includes(FINISHED, status)) {
if (this.latestTime) {
this.finished = this.latestTime;
if (!this.started) {
this.started = moment(this.latestTime).subtract(this.elapsed, 'seconds');
}
}
}
}; };
this.setProjectStatus = status => { this.setProjectStatus = status => {