diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 0ffa938801..4c9d0b7e46 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -337,7 +337,9 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin): if self.scm_type and not self.local_path.startswith('_'): update_fields.append('local_path') if update_fields: - self.save(update_fields=update_fields) + from awx.main.signals import disable_activity_stream + with disable_activity_stream(): + self.save(update_fields=update_fields) # If we just created a new project with SCM, start the initial update. if new_instance and self.scm_type and not skip_update: self.update() diff --git a/awx/main/scheduler/__init__.py b/awx/main/scheduler/__init__.py index cfef6bbf7c..8e0e1fc340 100644 --- a/awx/main/scheduler/__init__.py +++ b/awx/main/scheduler/__init__.py @@ -222,11 +222,11 @@ class TaskManager(): if not task.supports_isolation() and rampart_group.controller_id: # non-Ansible jobs on isolated instances run on controller task.instance_group = rampart_group.controller - logger.debug('Submitting isolated job {} to queue {} via {}.'.format( + logger.info('Submitting isolated job {} to queue {} via {}.'.format( task.id, task.instance_group_id, rampart_group.controller_id)) else: task.instance_group = rampart_group - logger.debug('Submitting job {} to instance group {}.'.format(task.id, task.instance_group_id)) + logger.info('Submitting job {} to instance group {}.'.format(task.id, task.instance_group_id)) with disable_activity_stream(): task.save() @@ -263,8 +263,10 @@ class TaskManager(): def capture_chain_failure_dependencies(self, task, dependencies): for dep in dependencies: - dep.dependent_jobs.add(task.id) - dep.save() + with disable_activity_stream(): + logger.info('Adding unified job {} to list of dependencies of {}.'.format(task.id, dep.id)) + dep.dependent_jobs.add(task.id) + dep.save() def should_update_inventory_source(self, job, inventory_source): now = tz_now()