From 3e88894f8501acac9e3ee2003f7f35cca09e0a0a Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Sun, 23 Mar 2014 18:37:30 -0400 Subject: [PATCH] Temporarily relax task notification and rely on polling --- awx/main/models/inventory.py | 2 +- awx/main/models/jobs.py | 2 +- awx/main/models/projects.py | 2 +- awx/main/tasks.py | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 5e053cc424..b5bc77aea1 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -781,5 +781,5 @@ class InventoryUpdate(CommonTask): self.save() self.start_args = encrypt_field(self, 'start_args') self.save() - notify_task_runner.delay(dict(task_type="inventory_update", id=self.id, metadata=kwargs)) + # notify_task_runner.delay(dict(task_type="inventory_update", id=self.id, metadata=kwargs)) return True diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index d7118cf3f4..e08b628b09 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -400,7 +400,7 @@ class Job(CommonTask): self.save() self.start_args = encrypt_field(self, 'start_args') self.save() - notify_task_runner.delay(dict(task_type="ansible_playbook", id=self.id)) + # notify_task_runner.delay(dict(task_type="ansible_playbook", id=self.id)) return True def start(self, error_callback, **kwargs): diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 93c45f6cd5..3a2d45a642 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -393,7 +393,7 @@ class ProjectUpdate(CommonTask): self.save() self.start_args = encrypt_field(self, 'start_args') self.save() - notify_task_runner.delay(dict(task_type="project_update", id=self.id, metadata=kwargs)) + # notify_task_runner.delay(dict(task_type="project_update", id=self.id, metadata=kwargs)) return True def _update_parent_instance(self): diff --git a/awx/main/tasks.py b/awx/main/tasks.py index c05f4b8031..ef80470713 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -132,7 +132,8 @@ class BaseTask(Task): self.model._meta.object_name, retry_count) def signal_finished(self, pk): - notify_task_runner(dict(complete=pk)) + pass + # notify_task_runner(dict(complete=pk)) def get_model(self, pk): return self.model.objects.get(pk=pk)