tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4591 from shin-/4580-log-api-error 

Avoid encoding crash in log_api_error
This commit is contained in:
Joffrey F 2017-03-10 14:02:44 -08:00 committed by GitHub
parent beedceb66b c3bcd59aeb
commit dd294ce9cc
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compose/cli/errors.py
View File

@ -7,6 +7,7 @@ import socket
from distutils.spawn import find_executable from distutils.spawn import find_executable
from textwrap import dedent from textwrap import dedent
import six
from docker.errors import APIError from docker.errors import APIError
from requests.exceptions import ConnectionError as RequestsConnectionError from requests.exceptions import ConnectionError as RequestsConnectionError
from requests.exceptions import ReadTimeout from requests.exceptions import ReadTimeout
@ -68,14 +69,18 @@ def log_timeout_error(timeout):
def log_api_error(e, client_version): def log_api_error(e, client_version):
if b'client is newer than server' not in e.explanation: explanation = e.explanation
log.error(e.explanation) if isinstance(explanation, six.binary_type):
explanation = explanation.decode('utf-8')
if 'client is newer than server' not in explanation:
log.error(explanation)
return return
version = API_VERSION_TO_ENGINE_VERSION.get(client_version) version = API_VERSION_TO_ENGINE_VERSION.get(client_version)
if not version: if not version:
# They've set a custom API version # They've set a custom API version
log.error(e.explanation) log.error(explanation)
return return
log.error( log.error(

16
tests/unit/cli/errors_test.py
View File

@ -42,10 +42,26 @@ class TestHandleConnectionErrors(object):
_, args, _ = mock_logging.error.mock_calls[0] _, args, _ = mock_logging.error.mock_calls[0]
assert "Docker Engine of version 1.10.0 or greater" in args[0] assert "Docker Engine of version 1.10.0 or greater" in args[0]
def test_api_error_version_mismatch_unicode_explanation(self, mock_logging):
with pytest.raises(errors.ConnectionError):
with handle_connection_errors(mock.Mock(api_version='1.22')):
raise APIError(None, None, u"client is newer than server")
_, args, _ = mock_logging.error.mock_calls[0]
assert "Docker Engine of version 1.10.0 or greater" in args[0]
def test_api_error_version_other(self, mock_logging): def test_api_error_version_other(self, mock_logging):
msg = b"Something broke!" msg = b"Something broke!"
with pytest.raises(errors.ConnectionError): with pytest.raises(errors.ConnectionError):
with handle_connection_errors(mock.Mock(api_version='1.22')): with handle_connection_errors(mock.Mock(api_version='1.22')):
raise APIError(None, None, msg) raise APIError(None, None, msg)
mock_logging.error.assert_called_once_with(msg.decode('utf-8'))
def test_api_error_version_other_unicode_explanation(self, mock_logging):
msg = u"Something broke!"
with pytest.raises(errors.ConnectionError):
with handle_connection_errors(mock.Mock(api_version='1.22')):
raise APIError(None, None, msg)
mock_logging.error.assert_called_once_with(msg) mock_logging.error.assert_called_once_with(msg)