shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

properly serialize external logs that contain decimal.Decimal objects

Browse Source
This commit is contained in:
Ryan Petrello 2020-04-03 14:43:05 -04:00
parent a46462eede
commit 2cefba6f96
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/main/utils/formatters.py
View File

@ -3,13 +3,13 @@
from copy import copy
import json
import time
import logging
import traceback
import socket
from datetime import datetime
from dateutil.tz import tzutc
from django.core.serializers.json import DjangoJSONEncoder
from django.conf import settings
@ -91,18 +91,13 @@ class LogstashFormatterBase(logging.Formatter):
'processName': record.processName,
}
@classmethod
def format_timestamp(cls, time):
tstamp = datetime.utcfromtimestamp(time)
return tstamp.strftime("%Y-%m-%dT%H:%M:%S") + ".%03d" % (tstamp.microsecond / 1000) + "Z"
@classmethod
def format_exception(cls, exc_info):
return ''.join(traceback.format_exception(*exc_info)) if exc_info else ''
@classmethod
def serialize(cls, message):
return bytes(json.dumps(message), 'utf-8')
return bytes(json.dumps(message, cls=DjangoJSONEncoder), 'utf-8')
class LogstashFormatter(LogstashFormatterBase):
@ -157,9 +152,6 @@ class LogstashFormatter(LogstashFormatterBase):
try:
data_for_log[key] = getattr(job_event, fd)
if fd in ['created', 'modified'] and data_for_log[key] is not None:
time_float = time.mktime(data_for_log[key].timetuple())
data_for_log[key] = self.format_timestamp(time_float)
except Exception as e:
data_for_log[key] = 'Exception `{}` producing field'.format(e)
@ -231,10 +223,12 @@ class LogstashFormatter(LogstashFormatterBase):
return fields
def format(self, record):
stamp = datetime.utcfromtimestamp(record.created)
stamp = stamp.replace(tzinfo=tzutc())
message = {
# Field not included, but exist in related logs
# 'path': record.pathname
'@timestamp': self.format_timestamp(record.created),
'@timestamp': stamp,
'message': record.getMessage(),
'host': self.host,