Skip to content

Fixed bugs with python > 3.4 #78

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
SalahAdDin wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fixed bugs with python > 3.4 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ce0ea3
Update formatter.py
SalahAdDin Feb 3, 2018
ad7f108
Update handler_tcp.py
SalahAdDin Feb 3, 2018
acee185
Update setup.py
SalahAdDin Feb 3, 2018
0fc9c22
Update formatter.py
SalahAdDin Feb 3, 2018
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
9 changes: 5 additions & 4 deletions logstash/formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
import socket
import sys
from datetime import datetime

try:
import json
except ImportError:
import simplejson as json


class LogstashFormatterBase(logging.Formatter):

def __init__(self, message_type='Logstash', tags=None, fqdn=False):
self.message_type = message_type
self.tags = tags if tags is not None else []
Expand All @@ -28,7 +28,8 @@ def get_extra_fields(self, record):
'funcName', 'id', 'levelname', 'levelno', 'lineno', 'module',
'msecs', 'msecs', 'message', 'msg', 'name', 'pathname', 'process',
'processName', 'relativeCreated', 'thread', 'threadName', 'extra',
'auth_token', 'password')
'auth_token', 'password'
)

if sys.version_info < (3, 0):
easy_types = (basestring, bool, dict, float, int, long, list, type(None))
Expand Down Expand Up @@ -82,7 +83,8 @@ def serialize(cls, message):
if sys.version_info < (3, 0):
return json.dumps(message)
else:
return bytes(json.dumps(message), 'utf-8')
return str(json.dumps(message))


class LogstashFormatterVersion0(LogstashFormatterBase):
version = 0
Expand Down Expand Up @@ -115,7 +117,6 @@ def format(self, record):


class LogstashFormatterVersion1(LogstashFormatterBase):

def format(self, record):
# Create message dict
message = {
Expand Down
2 changes: 1 addition & 1 deletion logstash/handler_tcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ def __init__(self, host, port=5959, message_type='logstash', tags=None, fqdn=Fal
self.formatter = formatter.LogstashFormatterVersion0(message_type, tags, fqdn)

def makePickle(self, record):
return self.formatter.format(record) + b'\n'
return self.formatter.format(record) + '\n'
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
setup(
name='python-logstash',
packages=['logstash'],
install_requires=['pika'],
version='0.4.7',
description='Python logging handler for Logstash.',
long_description=open('README.rst').read(),
Expand Down