From 13ee4e604851bcd24604f96dc4603a5b94fcf312 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 2 Dec 2014 15:45:47 -0500 Subject: [PATCH] Fix up an issue passing the callback port, which isn't strictly necessary... if provided it causes a crash that corrupts the shell --- awx/main/models/unified_jobs.py | 7 ++++--- awx/main/tasks.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index d98d8a0972..d582209e73 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -729,9 +729,10 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique task_type = get_type_for_model(self) # Actually tell the task runner to run this task. - from awx.main.tasks import notify_task_runner - notify_task_runner.delay({'id': self.id, 'metadata': kwargs, - 'task_type': task_type}) + # NOTE: This will deadlock the task runner + #from awx.main.tasks import notify_task_runner + #notify_task_runner.delay({'id': self.id, 'metadata': kwargs, + # 'task_type': task_type}) # Done! return True diff --git a/awx/main/tasks.py b/awx/main/tasks.py index d5f77f1145..f7c60fcad6 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -585,7 +585,7 @@ class RunJob(BaseTask): env['ANSIBLE_CALLBACK_PLUGINS'] = plugin_dir env['REST_API_URL'] = settings.INTERNAL_API_URL 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): env['JOB_CALLBACK_DEBUG'] = '2' elif settings.DEBUG: