1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00

Merge pull request #174 from AlanCoding/task_callback_logs

Improve logging for errors in job success/fail hooks
This commit is contained in:
Alan Rominger 2017-08-03 12:17:29 -04:00 committed by GitHub
commit a87f6bfe62

View File

@ -329,7 +329,7 @@ def handle_work_success(self, result, task_actual):
try: try:
instance = UnifiedJob.get_instance_by_type(task_actual['type'], task_actual['id']) instance = UnifiedJob.get_instance_by_type(task_actual['type'], task_actual['id'])
except ObjectDoesNotExist: except ObjectDoesNotExist:
logger.warning('Missing job `{}` in success callback.'.format(task_actual['id'])) logger.warning('Missing {} `{}` in success callback.'.format(task_actual['type'], task_actual['id']))
return return
if not instance: if not instance:
return return
@ -342,13 +342,16 @@ def handle_work_success(self, result, task_actual):
@task(bind=True, queue='tower', base=LogErrorsTask) @task(bind=True, queue='tower', base=LogErrorsTask)
def handle_work_error(self, task_id, subtasks=None): def handle_work_error(self, task_id, subtasks=None):
print('Executing error task id %s, subtasks: %s' % logger.debug('Executing error task id %s, subtasks: %s' % (str(self.request.id), str(subtasks)))
(str(self.request.id), str(subtasks)))
first_instance = None first_instance = None
first_instance_type = '' first_instance_type = ''
if subtasks is not None: if subtasks is not None:
for each_task in subtasks: for each_task in subtasks:
try:
instance = UnifiedJob.get_instance_by_type(each_task['type'], each_task['id']) instance = UnifiedJob.get_instance_by_type(each_task['type'], each_task['id'])
except ObjectDoesNotExist:
logger.warning('Missing {} `{}` in success callback.'.format(each_task['type'], task_actual['id']))
instance = None
if not instance: if not instance:
# Unknown task type # Unknown task type
logger.warn("Unknown task type: {}".format(each_task['type'])) logger.warn("Unknown task type: {}".format(each_task['type']))