External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 05:59:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

disable 2 more types of unhelpful act. str. entries

Browse Source 
project local_path changed as a secondary save after creation
adding jobs to dependency list (not user facing)
This commit is contained in:
AlanCoding
2017-07-21 07:47:25 -04:00
parent 55ca8d439b
commit a2b98f0a40
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/projects.py
View File

@@ -337,7 +337,9 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
if self.scm_type and not self.local_path.startswith('_'): if self.scm_type and not self.local_path.startswith('_'):
update_fields.append('local_path') update_fields.append('local_path')
if update_fields: 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 we just created a new project with SCM, start the initial update.
if new_instance and self.scm_type and not skip_update: if new_instance and self.scm_type and not skip_update:
self.update() self.update()

10
awx/main/scheduler/__init__.py
View File

@@ -222,11 +222,11 @@ class TaskManager():
if not task.supports_isolation() and rampart_group.controller_id: if not task.supports_isolation() and rampart_group.controller_id:
# non-Ansible jobs on isolated instances run on controller # non-Ansible jobs on isolated instances run on controller
task.instance_group = rampart_group.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)) task.id, task.instance_group_id, rampart_group.controller_id))
else: else:
task.instance_group = rampart_group 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(): with disable_activity_stream():
task.save() task.save()
@@ -263,8 +263,10 @@ class TaskManager():
def capture_chain_failure_dependencies(self, task, dependencies): def capture_chain_failure_dependencies(self, task, dependencies):
for dep in dependencies: for dep in dependencies:
dep.dependent_jobs.add(task.id) with disable_activity_stream():
dep.save() 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): def should_update_inventory_source(self, job, inventory_source):
now = tz_now() now = tz_now()