Skip to content

Commit

Permalink
Fix getting a read timeout for logs/attach with a tty and slow output
Browse files Browse the repository at this point in the history
Fixes #931

Signed-off-by: Segev Finer <[email protected]>
  • Loading branch information
segevfiner committed Sep 17, 2021
1 parent 264688e commit 63618b5
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions docker/api/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,12 @@ def _multiplexed_response_stream_helper(self, response):
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):
Expand Down

0 comments on commit 63618b5

Please sign in to comment.