External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 18:21:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix up an issue passing the callback port, which isn't strictly

Browse Source 
necessary... if provided it causes a crash that corrupts the shell
This commit is contained in:
Matthew Jones
2014-12-02 15:45:47 -05:00
parent 7e94282934
commit 13ee4e6048
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -729,9 +729,10 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
task_type = get_type_for_model(self) task_type = get_type_for_model(self)
# Actually tell the task runner to run this task. # Actually tell the task runner to run this task.
from awx.main.tasks import notify_task_runner # NOTE: This will deadlock the task runner
notify_task_runner.delay({'id': self.id, 'metadata': kwargs, #from awx.main.tasks import notify_task_runner
'task_type': task_type}) #notify_task_runner.delay({'id': self.id, 'metadata': kwargs,
# 'task_type': task_type})
# Done! # Done!
return True return True

2
awx/main/tasks.py
View File

@@ -585,7 +585,7 @@ class RunJob(BaseTask):
env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_dir env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_dir
env['REST_API_URL'] = settings.INTERNAL_API_URL env['REST_API_URL'] = settings.INTERNAL_API_URL
env['REST_API_TOKEN'] = job.task_auth_token or '' env['REST_API_TOKEN'] = job.task_auth_token or ''
env['CALLBACK_CONSUMER_PORT'] = settings.CALLBACK_CONSUMER_PORT #env['CALLBACK_CONSUMER_PORT'] = settings.CALLBACK_CONSUMER_PORT
if getattr(settings, 'JOB_CALLBACK_DEBUG', False): if getattr(settings, 'JOB_CALLBACK_DEBUG', False):
env['JOB_CALLBACK_DEBUG'] = '2' env['JOB_CALLBACK_DEBUG'] = '2'
elif settings.DEBUG: elif settings.DEBUG: