Skip to content

Use str() when json.dumps() finds an unserializable record #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matt-snider wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use str() when json.dumps() finds an unserializable record #59

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d16c713
Use str() when json.dumps() finds an unserializable record
matt-snider Oct 17, 2016
2301699
Remove type conversions in LogstashFormatterBase.get_extra_fields()
matt-snider Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions logstash/formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,10 @@ def get_extra_fields(self, record):
'msecs', 'msecs', 'message', 'msg', 'name', 'pathname', 'process',
'processName', 'relativeCreated', 'thread', 'threadName', 'extra',
'auth_token', 'password')

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))

fields = {}

for key, value in record.__dict__.items():
if key not in skip_list:
if isinstance(value, easy_types):
fields[key] = value
else:
fields[key] = repr(value)

fields[key] = value
return fields

def get_debug_fields(self, record):
Expand Down Expand Up @@ -79,10 +68,10 @@ def format_exception(cls, exc_info):

@classmethod
def serialize(cls, message):
if sys.version_info < (3, 0):
return json.dumps(message)
else:
return bytes(json.dumps(message), 'utf-8')
data = json.dumps(message, default=str)
if sys.version_info >= (3, 0):
data = bytes(data, 'utf-8')
return data

class LogstashFormatterVersion0(LogstashFormatterBase):
version = 0
Expand Down