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

Prune the python2 specific logic from log formatter

Browse Source
This commit is contained in:
AlanCoding 2019-01-23 09:48:51 -05:00
parent 127495b53d
commit 8a72a4d39d
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,10 +46,7 @@ class LogstashFormatterBase(logging.Formatter):
'msecs', 'msecs', 'message', 'msg', 'name', 'pathname', 'process',
'processName', 'relativeCreated', 'thread', 'threadName', 'extra')
if sys.version_info < (3, 0):
easy_types = (basestring, bool, dict, float, int, long, list, type(None))
else:
easy_types = (str, bool, dict, float, int, list, type(None))
easy_types = (str, bool, dict, float, int, list, type(None))
fields = {}
@ -63,23 +60,15 @@ class LogstashFormatterBase(logging.Formatter):
return fields
def get_debug_fields(self, record):
fields = {
return {
'stack_trace': self.format_exception(record.exc_info),
'lineno': record.lineno,
'process': record.process,
'thread_name': record.threadName,
'funcName': record.funcName,
'processName': record.processName,
}
# funcName was added in 2.5
if not getattr(record, 'funcName', None):
fields['funcName'] = record.funcName
# processName was added in 2.6
if not getattr(record, 'processName', None):
fields['processName'] = record.processName
return fields
@classmethod
def format_timestamp(cls, time):
tstamp = datetime.utcfromtimestamp(time)
@ -91,10 +80,7 @@ class LogstashFormatterBase(logging.Formatter):
@classmethod
def serialize(cls, message):
if sys.version_info < (3, 0):
return json.dumps(message)
else:
return bytes(json.dumps(message), 'utf-8')
return bytes(json.dumps(message), 'utf-8')
class LogstashFormatter(LogstashFormatterBase):