summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnca Iordache <aiordache@users.noreply.github.com>2021-09-17 12:58:19 +0200
committerGitHub <noreply@github.com>2021-09-17 12:58:19 +0200
commitb27faa62e792c141a5d20c4acdd240fdac7d282f (patch)
tree2bd78c1fd8cb74d04cacfd50c096e14fa5a3695f
parent264688e37c9496496807edfd305aea60b57e1adf (diff)
parent63618b5e11e9326ed6e4cad6a0b012b9dc02593f (diff)
downloaddocker-py-b27faa62e792c141a5d20c4acdd240fdac7d282f.tar.gz
Merge pull request #1959 from segevfiner/logs-read-timeout
Fix getting a read timeout for logs/attach with a tty and slow output
-rw-r--r--docker/api/client.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/api/client.py b/docker/api/client.py
index f0cb39b..2667922 100644
--- a/docker/api/client.py
+++ b/docker/api/client.py
@@ -397,6 +397,12 @@ class APIClient(
def _stream_raw_result(self, response, chunk_size=1, decode=True):
''' Stream result for TTY-enabled container and raw binary data'''
self._raise_for_status(response)
+
+ # Disable timeout on the underlying socket to prevent
+ # Read timed out(s) for long running processes
+ socket = self._get_raw_response_socket(response)
+ self._disable_socket_timeout(socket)
+
yield from response.iter_content(chunk_size, decode)
def _read_from_socket(self, response, stream, tty=True, demux=False):