Skip to content
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

Handled possible case of non-bytes result from self.formatted.format #18

Merged
merged 1 commit into from
Jan 14, 2018
Merged

Handled possible case of non-bytes result from self.formatted.format #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions logstash_async/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from logging import Handler

from six import string_types
from six import string_types, text_type

import logstash_async
from logstash_async.formatter import LogstashFormatter
Expand Down Expand Up @@ -39,7 +39,7 @@ class AsynchronousLogstashHandler(Handler):
# ----------------------------------------------------------------------
def __init__(self, host, port, database_path, transport='logstash_async.transport.TcpTransport',
ssl_enable=False, ssl_verify=True, keyfile=None, certfile=None, ca_certs=None,
enable=True, event_ttl=None):
enable=True, event_ttl=None, encoding='utf-8'):
super(AsynchronousLogstashHandler, self).__init__()
self._host = host
self._port = port
Expand All @@ -53,6 +53,7 @@ def __init__(self, host, port, database_path, transport='logstash_async.transpor
self._enable = enable
self._transport = None
self._event_ttl = event_ttl
self._encoding = encoding
self._setup_transport()

# ----------------------------------------------------------------------
Expand Down Expand Up @@ -124,7 +125,10 @@ def _worker_thread_is_running():
# ----------------------------------------------------------------------
def _format_record(self, record):
self._create_formatter_if_necessary()
return self.formatter.format(record) + b'\n'
formatted = self.formatter.format(record)
if isinstance(formatted, text_type):
formatted = formatted.encode(self._encoding)
return formatted + b'\n'

# ----------------------------------------------------------------------
def _create_formatter_if_necessary(self):
Expand Down