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

Fix chunked stdout display issue

Browse Source 
* We removed stdout redaction from jobs and job templates but only for
  the full stdout dump, this extends it to the limited display also
This commit is contained in:
Matthew Jones
2015-08-25 16:05:03 -04:00
parent 896b0e18f3
commit 549809dfa4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/projects.py
View File

@@ -357,6 +357,12 @@ class ProjectUpdate(UnifiedJob, ProjectOptions):
def result_stdout(self): def result_stdout(self):
return self._result_stdout_raw(redact_sensitive=True, escape_ascii=True) return self._result_stdout_raw(redact_sensitive=True, escape_ascii=True)
def result_stdout_raw_limited(self, start_line=0, redact_sensitive=True, end_line=None):
return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive)
def result_stdout_limited(self, start_line=0, end_line=None, redact_sensitive=True):
return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive, escape_ascii=True)
def get_absolute_url(self): def get_absolute_url(self):
return reverse('api:project_update_detail', args=(self.pk,)) return reverse('api:project_update_detail', args=(self.pk,))

8
awx/main/models/unified_jobs.py
View File

@@ -670,11 +670,11 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
return return_buffer, start_actual, end_actual, absolute_end return return_buffer, start_actual, end_actual, absolute_end
def result_stdout_raw_limited(self, start_line=0, end_line=None): def result_stdout_raw_limited(self, start_line=0, redact_sensitive=False, end_line=None):
return self._result_stdout_raw_limited(start_line, end_line) return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive)
def result_stdout_limited(self, start_line=0, end_line=None): def result_stdout_limited(self, start_line=0, end_line=None, redact_sensitive=False):
return self._result_stdout_raw_limited(start_line, end_line, escape_ascii=True) return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive, escape_ascii=True)
@property @property
def celery_task(self): def celery_task(self):