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

Merge pull request #366 from AlanCoding/logger_unicode

Browse Source 
smart_str in log statement to avoid unicode error
This commit is contained in:
Alan Rominger
2017-08-30 10:33:43 -04:00
committed by GitHub
parent d3507eb42c 78ab13a44e
commit 2385c28046
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ from django.db.models import Q, Count
from django.utils.dateparse import parse_datetime from django.utils.dateparse import parse_datetime
from dateutil import parser from dateutil import parser
from dateutil.tz import tzutc from dateutil.tz import tzutc
from django.utils.encoding import force_text from django.utils.encoding import force_text, smart_str
from django.utils.timezone import utc from django.utils.timezone import utc
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
@@ -785,10 +785,12 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
if 'insights' in ansible_facts and 'system_id' in ansible_facts['insights']: if 'insights' in ansible_facts and 'system_id' in ansible_facts['insights']:
host.insights_system_id = ansible_facts['insights']['system_id'] host.insights_system_id = ansible_facts['insights']['system_id']
host.save() host.save()
system_tracking_logger.info('New fact for inventory {} host {}'.format(host.inventory.name, host.name), system_tracking_logger.info(
extra=dict(inventory_id=host.inventory.id, host_name=host.name, 'New fact for inventory {} host {}'.format(
ansible_facts=host.ansible_facts, smart_str(host.inventory.name), smart_str(host.name)),
ansible_facts_modified=host.ansible_facts_modified.isoformat())) extra=dict(inventory_id=host.inventory.id, host_name=host.name,
ansible_facts=host.ansible_facts,
ansible_facts_modified=host.ansible_facts_modified.isoformat()))
class JobHostSummary(CreatedModifiedModel): class JobHostSummary(CreatedModifiedModel):