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

fix stdout ordering missing event issue

Browse Source
This commit is contained in:
John Mitchell
2017-08-28 15:06:58 -04:00
parent e6d4de301b
commit a5321179ac
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/job-results/event-queue.service.js
View File

@@ -28,6 +28,7 @@ export default ['jobResultsService', 'parseStdoutService', function(jobResultsSe
mungedEvent.stdout = parseStdoutService.parseStdout(event); mungedEvent.stdout = parseStdoutService.parseStdout(event);
mungedEvent.start_line = event.start_line + 1; mungedEvent.start_line = event.start_line + 1;
mungedEvent.end_line = event.end_line + 1; mungedEvent.end_line = event.end_line + 1;
mungedEvent.actual_end_line = parseStdoutService.actualEndLine(event) + 1;
mungedEvent.changes.push('stdout'); mungedEvent.changes.push('stdout');
} }

4
awx/ui/client/src/job-results/job-results.controller.js
View File

@@ -288,7 +288,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
var linesInPane = []; var linesInPane = [];
function addToLinesInPane(event) { function addToLinesInPane(event) {
var arr = _.range(event.start_line, event.end_line); var arr = _.range(event.start_line, event.actual_end_line);
linesInPane = linesInPane.concat(arr); linesInPane = linesInPane.concat(arr);
linesInPane = linesInPane.sort(function(a, b) { linesInPane = linesInPane.sort(function(a, b) {
return a - b; return a - b;
@@ -313,7 +313,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
.append($compile(event .append($compile(event
.stdout)($scope.events[event .stdout)($scope.events[event
.counter])); .counter]));
}; }
function putInCorrectPlace(event) { function putInCorrectPlace(event) {
if (linesInPane.length) { if (linesInPane.length) {

3
awx/ui/client/src/job-results/parse-stdout.service.js
View File

@@ -258,6 +258,9 @@ export default ['$log', 'moment', 'i18n', function($log, moment, i18n){
return _.zip(lineNums, lines).slice(0, -1); return _.zip(lineNums, lines).slice(0, -1);
}, },
actualEndLine: function(event) {
return event.start_line + this.getLineArr(event).length;
},
// public function that provides the parsed stdout line, given a // public function that provides the parsed stdout line, given a
// job_event // job_event
parseStdout: function(event){ parseStdout: function(event){