External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-22 08:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

move formatter to logger file, settings reload on startup

Browse Source
This commit is contained in:
AlanCoding
2016-12-01 19:09:55 -05:00
parent 3643d9c06b
commit 7344a998b2
12 changed files with 156 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ from awx.main.models.notifications import (
from awx.main.utils import (
ignore_inventory_computed_fields,
parse_yaml_or_json,
format_for_log
)
from awx.main.redact import PlainTextCleaner
from awx.main.fields import ImplicitRoleField
@@ -44,7 +43,7 @@ from awx.main.consumers import emit_channel_notification
logger = logging.getLogger('awx.main.models.jobs')
event_logger = logging.getLogger('awx.analytics.job_events')
analytics_logger = logging.getLogger('awx.analytics.job_events')
__all__ = ['JobTemplate', 'Job', 'JobHostSummary', 'JobEvent', 'SystemJobOptions', 'SystemJobTemplate', 'SystemJob']
@@ -1188,8 +1187,7 @@ class JobEvent(CreatedModifiedModel):
if parent_id:
kwargs['parent_id'] = parent_id
# event_logger.info('Body: {}'.format(str(data_for_log)), extra=data_for_log)
event_logger.info('Job event data saved.', extra=format_for_log(kwargs, kind='event'))
analytics_logger.info('Job event data saved.', extra=dict(event_model_data=kwargs))
job_event = JobEvent.objects.create(**kwargs)
@@ -1201,6 +1199,7 @@ class JobEvent(CreatedModifiedModel):
# Save artifact data to parent job (if provided).
if artifact_data:
artifact_dict = json.loads(artifact_data)
event_data = kwargs.get('event_data', None)
if event_data and isinstance(event_data, dict):
res = event_data.get('res', None)
if res and isinstance(res, dict):