From e19984d6db48183cad3c5ef319812b8f14f0d770 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Fri, 25 Jul 2014 14:53:50 -0400 Subject: [PATCH] Fix some busted job stdout end-line calculation under certain conditions. Make it to where the ui re-uses the endpoint from the last stdout request cycle instead of adding one to it since we are not left-inclusive on list slicing. --- awx/main/models/unified_jobs.py | 2 +- awx/ui/static/js/controllers/JobStdout.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index c9e69f9840..636a8367f0 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -534,7 +534,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique else: start_actual = int(start_line) if end_line is not None: - end_actual = min(int(start_line)+int(end_line), len(stdout_lines)) + end_actual = min(int(end_line), len(stdout_lines)) else: end_actual = len(stdout_lines) return return_buffer, start_actual, end_actual, absolute_end diff --git a/awx/ui/static/js/controllers/JobStdout.js b/awx/ui/static/js/controllers/JobStdout.js index 088e3c619f..9a191d3288 100644 --- a/awx/ui/static/js/controllers/JobStdout.js +++ b/awx/ui/static/js/controllers/JobStdout.js @@ -237,7 +237,7 @@ function JobStdoutController ($log, $rootScope, $scope, $compile, $routeParams, function getNextSection() { // get the next range of data from the API - var start = loaded_sections[loaded_sections.length - 1].end + 1, url; + var start = loaded_sections[loaded_sections.length - 1].end, url; url = stdout_url + '?format=json&start_line=' + start + '&end_line=' + (start + page_size); $('#stdoutMoreRowsBottom').fadeIn(); Rest.setUrl(url);