Skip to content

fix python 3.x str.decode exception #877

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

Merged
merged 4 commits into from
Dec 10, 2018
Merged

fix python 3.x str.decode exception #877

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4616454
fix python 3.x str.decode exception
mmarshallgh Nov 28, 2018
bcde850
Moved try clause inside the if statement
mmarshallgh Nov 29, 2018
4668cfb
Moved try clause inside the if statement
mmarshallgh Dec 6, 2018
2b430b4
Merge branch 'fixbasedecode' of github.com:mmarshallgh/elasticsearch-…
mmarshallgh Dec 6, 2018
File filter

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: 8 additions & 2 deletions elasticsearch/connection/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ def log_request_success(self, method, full_url, path, body, status_code, respons
# body has already been serialized to utf-8, deserialize it for logging
# TODO: find a better way to avoid (de)encoding the body back and forth
if body:
body = body.decode('utf-8', 'ignore')
try:
body = body.decode('utf-8', 'ignore')
except AttributeError:
pass

logger.info(
'%s %s [status:%s request:%.3fs]', method, full_url,
Expand All @@ -100,7 +103,10 @@ def log_request_fail(self, method, full_url, path, body, duration, status_code=N
# body has already been serialized to utf-8, deserialize it for logging
# TODO: find a better way to avoid (de)encoding the body back and forth
if body:
body = body.decode('utf-8', 'ignore')
try:
body = body.decode('utf-8', 'ignore')
except AttributeError:
pass

logger.debug('> %s', body)

Expand Down