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

Merge pull request #5784 from ansible/runner_changes_42 (#12083)

Browse Source
This commit is contained in:
John Westcott IV
2022-04-22 10:46:35 -04:00
committed by GitHub
parent 47160f0118
commit a0ccc8c925
6 changed files with 90 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/tasks/receptor.py
View File

@@ -24,8 +24,10 @@ from awx.main.utils.common import (
parse_yaml_or_json,
cleanup_new_process,
)
from awx.main.constants import MAX_ISOLATED_PATH_COLON_DELIMITER
from awx.main.constants import (
MAX_ISOLATED_PATH_COLON_DELIMITER,
ANSIBLE_RUNNER_NEEDS_UPDATE_MESSAGE,
)
# Receptorctl
from receptorctl.socket_interface import ReceptorControl
@@ -375,6 +377,8 @@ class AWXReceptorJob:
receptor_output = b"".join(lines).decode()
if receptor_output:
self.task.instance.result_traceback = receptor_output
if 'got an unexpected keyword argument' in receptor_output:
self.task.instance.result_traceback = "{}\n\n{}".format(receptor_output, ANSIBLE_RUNNER_NEEDS_UPDATE_MESSAGE)
self.task.instance.save(update_fields=['result_traceback'])
elif detail:
self.task.instance.result_traceback = detail