zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-19 22:41:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stdout_file_download' into upstream_master

Browse Source 
* stdout_file_download:
  Rework stdout display for file storage only
This commit is contained in:
Matthew Jones
2015-08-03 15:30:17 -04:00
parent 2f05ac7276 1c777c5441
commit bddcb06fab
5 changed files with 565 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -503,7 +503,7 @@ class BaseTask(Task):
safe_env = self.build_safe_env(instance, **kwargs)
if not os.path.exists(settings.JOBOUTPUT_ROOT):
os.makedirs(settings.JOBOUTPUT_ROOT)
stdout_filename = os.path.join(settings.JOBOUTPUT_ROOT, str(uuid.uuid1()) + ".out")
stdout_filename = os.path.join(settings.JOBOUTPUT_ROOT, "%d-%s.out" % (pk, str(uuid.uuid1())))
stdout_handle = codecs.open(stdout_filename, 'w', encoding='utf-8')
if self.should_use_proot(instance, **kwargs):
if not check_proot_installed():