Skip to content

Bugfix/py3 recordformatter incompatibility #22

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

Closed
wants to merge 3 commits into from
Closed

Bugfix/py3 recordformatter incompatibility #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1dc7d8f
Patch import chain to support "basestring" in python3
quasipedia Sep 12, 2014
31599d6
Update README to proper use of FluentRecordFormatter
quasipedia Sep 12, 2014
83794e0
Change RecordFormatter signature
quasipedia Sep 29, 2014
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
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ This client-library also has FluentHanler class for Python logging module.

logging.basicConfig(level=logging.INFO)
l = logging.getLogger('fluent.test')
l.addHandler(handler.FluentHandler('app.follow', host='host', port=24224))
h = handler.FluentHandler('app.follow', host='host', port=24224)
h.setFormatter(handler.FluentRecordFormatter())
l.addHandler(h)
l.info({
'from': 'userA',
'to': 'userB'
Expand Down
21 changes: 19 additions & 2 deletions fluent/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,23 @@
import logging
import socket

# This is a patch to make the code cross-compatible between python 2 and 3
# Source: http://www.rfk.id.au/blog/entry/preparing-pyenchant-for-python-3/
try:
unicode = unicode
except NameError:
# 'unicode' is undefined, must be Python 3
str = str
unicode = str
bytes = bytes
basestring = (str, bytes)
else:
# 'unicode' exists, must be Python 2
str = str
unicode = unicode
bytes = str
basestring = basestring

try:
import simplejson as json
except ImportError:
Expand All @@ -12,7 +29,7 @@


class FluentRecordFormatter(object):
def __init__(self):
def __init__(self, fmt=None, datefmt=None):
self.hostname = socket.gethostname()

def format(self, record):
Expand Down Expand Up @@ -75,4 +92,4 @@ def close(self):
self.sender._close()
logging.Handler.close(self)
finally:
self.release()
self.release()