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

Check connection for scan jobs before actually running the job, fail

Browse Source 
early if the system tracking database isn't available
This commit is contained in:
Matthew Jones
2015-06-09 15:30:53 -04:00
parent 58207b4a04
commit ab5c4b5f20
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/tasks.py
View File

@@ -43,6 +43,7 @@ from awx.main.queue import FifoQueue
from awx.main.utils import (get_ansible_version, decrypt_field, update_scm_url,
ignore_inventory_computed_fields, emit_websocket_notification,
check_proot_installed, build_proot_temp_dir, wrap_args_with_proot)
from awx.fact.utils.connection import test_mongo_connection
__all__ = ['RunJob', 'RunSystemJob', 'RunProjectUpdate', 'RunInventoryUpdate',
'RunAdHocCommand', 'handle_work_error', 'update_inventory_computed_fields']
@@ -436,6 +437,11 @@ class BaseTask(Task):
else:
return 'failed', child.exitstatus
def pre_run_hook(self, instance, **kwargs):
'''
Hook for any steps to run before the job/task starts
'''
def post_run_hook(self, instance, **kwargs):
'''
Hook for any steps to run after job/task is complete.
@@ -451,6 +457,7 @@ class BaseTask(Task):
status, rc, tb = 'error', None, ''
output_replacements = []
try:
self.pre_run_hook(instance, **kwargs)
if instance.cancel_flag:
instance = self.update_model(instance.pk, status='canceled')
if instance.status != 'running':
@@ -766,6 +773,14 @@ class RunJob(BaseTask):
'''
return getattr(settings, 'AWX_PROOT_ENABLED', False)
def pre_run_hook(self, job, **kwargs):
print("In pre-run")
if job.job_type == PERM_INVENTORY_SCAN:
print("In scan")
if not test_mongo_connection():
print("Mongo isn't running")
raise RuntimeError("Fact Scan Database is offline")
def post_run_hook(self, job, **kwargs):
'''
Hook for actions to run after job/task has completed.