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 #3168 from dnephin/fix_tty_timeout 

Handle all timeout errors consistently
This commit is contained in:
Aanand Prasad 2016-03-22 10:14:52 +00:00
parent aaa7b09369 f1dce50b3d
commit 4f5123bda9
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compose/cli/errors.py
View File

@ -3,12 +3,14 @@ from __future__ import unicode_literals
import contextlib import contextlib
import logging import logging
import socket
from textwrap import dedent from textwrap import dedent
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
from requests.exceptions import SSLError from requests.exceptions import SSLError
from requests.packages.urllib3.exceptions import ReadTimeoutError
from ..const import API_VERSION_TO_ENGINE_VERSION from ..const import API_VERSION_TO_ENGINE_VERSION
from ..const import HTTP_TIMEOUT from ..const import HTTP_TIMEOUT
@ -42,7 +44,11 @@ def handle_connection_errors(client):
except SSLError as e: except SSLError as e:
log.error('SSL error: %s' % e) log.error('SSL error: %s' % e)
raise ConnectionError() raise ConnectionError()
except RequestsConnectionError: except RequestsConnectionError as e:
if e.args and isinstance(e.args[0], ReadTimeoutError):
log_timeout_error()
raise ConnectionError()
if call_silently(['which', 'docker']) != 0: if call_silently(['which', 'docker']) != 0:
if is_mac(): if is_mac():
exit_with_error(docker_not_found_mac) exit_with_error(docker_not_found_mac)
@ -55,14 +61,18 @@ def handle_connection_errors(client):
except APIError as e: except APIError as e:
log_api_error(e, client.api_version) log_api_error(e, client.api_version)
raise ConnectionError() raise ConnectionError()
except ReadTimeout as e: except (ReadTimeout, socket.timeout) as e:
log_timeout_error()
raise ConnectionError()
def log_timeout_error():
log.error( log.error(
"An HTTP request took too long to complete. Retry with --verbose to " "An HTTP request took too long to complete. Retry with --verbose to "
"obtain debug information.\n" "obtain debug information.\n"
"If you encounter this issue regularly because of slow network " "If you encounter this issue regularly because of slow network "
"conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher " "conditions, consider setting COMPOSE_HTTP_TIMEOUT to a higher "
"value (current value: %s)." % HTTP_TIMEOUT) "value (current value: %s)." % HTTP_TIMEOUT)
raise ConnectionError()
def log_api_error(e, client_version): def log_api_error(e, client_version):