External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-01 16:58:46 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192 from AlanCoding/alan_bug

Browse Source 
fix logger bug introduced in task except
This commit is contained in:
Alan Rominger
2017-08-08 09:12:53 -04:00
committed by GitHub
parent 7b3846e62d e28e74b466
commit 9f63624292
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/jobs.py
View File

@@ -705,6 +705,8 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
JobNotificationMixin JobNotificationMixin
''' '''
def get_notification_templates(self): def get_notification_templates(self):
if not self.job_template:
return NotificationTemplate.objects.none()
return self.job_template.notification_templates return self.job_template.notification_templates
def get_notification_friendly_name(self): def get_notification_friendly_name(self):

2
awx/main/tasks.py
View File

@@ -350,7 +350,7 @@ def handle_work_error(self, task_id, subtasks=None):
try: 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: except ObjectDoesNotExist:
logger.warning('Missing {} `{}` in success callback.'.format(each_task['type'], task_actual['id'])) logger.warning('Missing {} `{}` in success callback.'.format(each_task['type'], each_task['id']))
instance = None instance = None
if not instance: if not instance:
# Unknown task type # Unknown task type